From c964194d85a7ada908ef05a5874174d211b7c759 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 12 Jan 2015 16:02:15 +0800
Subject: [PATCH 001/142] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E8=B0=83=E6=9F=A5=E7=9B=B8=E5=85=B3=E7=9A=84=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E3=80=81action=E3=80=81=E4=BB=A5=E5=8F=8A=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb | 110 +++++++++++++++++++++++++++++
 app/views/poll/add_answer.html.erb |   0
 app/views/poll/destroy.js.erb      |   1 +
 app/views/poll/edit.html.erb       |  13 ++++
 app/views/poll/index.html.erb      |   7 ++
 app/views/poll/new.html.erb        |   0
 config/routes.rb                   |   9 +++
 7 files changed, 140 insertions(+)
 create mode 100644 app/views/poll/add_answer.html.erb
 create mode 100644 app/views/poll/destroy.js.erb
 create mode 100644 app/views/poll/edit.html.erb
 create mode 100644 app/views/poll/index.html.erb
 create mode 100644 app/views/poll/new.html.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index a21fdb549..fbfef025e 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -1,2 +1,112 @@
 class PollController < ApplicationController
+  before_filter :find_poll_and_course, :only => [:edit,:update,:destory]
+  before_filter :find_container, :only => [:new,:create, :index]
+
+  def index
+    if @course
+      @polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id}")
+      respond_to do |format|
+        format.html{render :layout => 'base_courses'}
+      end
+    elsif @project
+      #项目的问卷调查相关代码
+    end
+  end
+
+  def show
+    @poll = Poll.find params[:id]
+  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,
+          :polls_description => ""
+      }
+      @poll = Poll.create option
+      if @poll
+        respond_to do |format|
+          format.html{render :layout => 'base_courses'}
+        end
+      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]
+    if @poll.save
+      respond_to do |format|
+        format.html { redirect_to poll_index_url(:polls_type => @course.class.to_s, :polls_group_id => @course.id) }
+      end
+    else
+    end
+  end
+
+  def destroy
+    if @poll.destroy
+      respond_to do |format|
+        format.js
+      end
+    end
+  end
+
+  #修改问卷标题和描述
+  def save_polls
+
+  end
+
+  #添加问题
+  def add_question
+  end
+
+  #添加选项
+  def add_answer
+    puts '1111111111111'
+  end
+
+  #选答案
+  def vote
+  end
+
+  #统计
+  def statistics
+  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
 end
\ No newline at end of file
diff --git a/app/views/poll/add_answer.html.erb b/app/views/poll/add_answer.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/poll/destroy.js.erb b/app/views/poll/destroy.js.erb
new file mode 100644
index 000000000..a9efe790e
--- /dev/null
+++ b/app/views/poll/destroy.js.erb
@@ -0,0 +1 @@
+alert("删除成功");
\ No newline at end of file
diff --git a/app/views/poll/edit.html.erb b/app/views/poll/edit.html.erb
new file mode 100644
index 000000000..a35b1d2e7
--- /dev/null
+++ b/app/views/poll/edit.html.erb
@@ -0,0 +1,13 @@
+<script type="text/javascript">
+  function submit_poll_edit()
+  {
+      $('#edit_poll_<%= @poll.id%>').submit();
+  }
+</script>
+<%= form_for(@poll) do |f|%>
+    <%= f.text_field :polls_name, :required => true, :name => "polls_name"%>
+    <a href="#" class="tijiao" onclick="submit_poll_edit();">
+      <%= l(:label_button_ok)  %>
+    </a>
+<% end%>
+
diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
new file mode 100644
index 000000000..4cf90d210
--- /dev/null
+++ b/app/views/poll/index.html.erb
@@ -0,0 +1,7 @@
+<% @polls.each do |poll|%>
+    <%= poll.id%>#####<%= poll.polls_name%>
+    <%= link_to l(:button_edit), edit_poll_path(poll.id)%>
+    <%= link_to(l(:button_delete), poll,
+                method: :delete, :confirm => l(:text_are_you_sure), :remote => true )  %>
+    <br/>
+<%end%>
\ No newline at end of file
diff --git a/app/views/poll/new.html.erb b/app/views/poll/new.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/config/routes.rb b/config/routes.rb
index 5611ed2b6..222fe17eb 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -58,6 +58,15 @@ RedmineApp::Application.routes.draw do
     end
   end
 
+  resources :poll do
+    member do
+      get 'add_question'
+      get 'add_answer'
+      get 'vote'
+      get 'statistics'
+    end
+  end
+
   resources :contest_notification
 
   resources :open_source_projects do

From c0fa21eb9f605ef9357aa368fe84de339bf904bc Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 12 Jan 2015 16:07:15 +0800
Subject: [PATCH 002/142] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=8F=8F=E8=BF=B0=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20150112080435_add_description_to_polls.rb | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 db/migrate/20150112080435_add_description_to_polls.rb

diff --git a/db/migrate/20150112080435_add_description_to_polls.rb b/db/migrate/20150112080435_add_description_to_polls.rb
new file mode 100644
index 000000000..135dc6bd4
--- /dev/null
+++ b/db/migrate/20150112080435_add_description_to_polls.rb
@@ -0,0 +1,9 @@
+class AddDescriptionToPolls < ActiveRecord::Migration
+  def up
+    add_column :polls, :polls_description, :text
+  end
+
+  def down
+    remove_column :polls,:polls_description
+  end
+end

From d0a6fa64e57683561d725aea1a3441724bfe07bc Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 12 Jan 2015 16:27:47 +0800
Subject: [PATCH 003/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/routes.rb | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 222fe17eb..911a0643f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -58,14 +58,7 @@ RedmineApp::Application.routes.draw do
     end
   end
 
-  resources :poll do
-    member do
-      get 'add_question'
-      get 'add_answer'
-      get 'vote'
-      get 'statistics'
-    end
-  end
+  resources :poll
 
   resources :contest_notification
 

From 1c24a306fe5b7476cd2a7dcd4b1bab7ae5ed90a2 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 12 Jan 2015 16:37:23 +0800
Subject: [PATCH 004/142] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84control?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_answer_controller.rb   |   2 -
 app/controllers/poll_controller.rb          | 112 --------------------
 app/controllers/poll_question_controller.rb |   2 -
 app/controllers/poll_user_controller.rb     |   2 -
 app/controllers/poll_vote_controller.rb     |   2 -
 5 files changed, 120 deletions(-)
 delete mode 100644 app/controllers/poll_answer_controller.rb
 delete mode 100644 app/controllers/poll_controller.rb
 delete mode 100644 app/controllers/poll_question_controller.rb
 delete mode 100644 app/controllers/poll_user_controller.rb
 delete mode 100644 app/controllers/poll_vote_controller.rb

diff --git a/app/controllers/poll_answer_controller.rb b/app/controllers/poll_answer_controller.rb
deleted file mode 100644
index 521f7ed3f..000000000
--- a/app/controllers/poll_answer_controller.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class PollAnswerController < ApplicationController
-end
\ No newline at end of file
diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
deleted file mode 100644
index fbfef025e..000000000
--- a/app/controllers/poll_controller.rb
+++ /dev/null
@@ -1,112 +0,0 @@
-class PollController < ApplicationController
-  before_filter :find_poll_and_course, :only => [:edit,:update,:destory]
-  before_filter :find_container, :only => [:new,:create, :index]
-
-  def index
-    if @course
-      @polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id}")
-      respond_to do |format|
-        format.html{render :layout => 'base_courses'}
-      end
-    elsif @project
-      #项目的问卷调查相关代码
-    end
-  end
-
-  def show
-    @poll = Poll.find params[:id]
-  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,
-          :polls_description => ""
-      }
-      @poll = Poll.create option
-      if @poll
-        respond_to do |format|
-          format.html{render :layout => 'base_courses'}
-        end
-      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]
-    if @poll.save
-      respond_to do |format|
-        format.html { redirect_to poll_index_url(:polls_type => @course.class.to_s, :polls_group_id => @course.id) }
-      end
-    else
-    end
-  end
-
-  def destroy
-    if @poll.destroy
-      respond_to do |format|
-        format.js
-      end
-    end
-  end
-
-  #修改问卷标题和描述
-  def save_polls
-
-  end
-
-  #添加问题
-  def add_question
-  end
-
-  #添加选项
-  def add_answer
-    puts '1111111111111'
-  end
-
-  #选答案
-  def vote
-  end
-
-  #统计
-  def statistics
-  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
-end
\ No newline at end of file
diff --git a/app/controllers/poll_question_controller.rb b/app/controllers/poll_question_controller.rb
deleted file mode 100644
index 46a75c0ab..000000000
--- a/app/controllers/poll_question_controller.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class PollQuestionController < ApplicationController
-end
\ No newline at end of file
diff --git a/app/controllers/poll_user_controller.rb b/app/controllers/poll_user_controller.rb
deleted file mode 100644
index 0373fe085..000000000
--- a/app/controllers/poll_user_controller.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class PollUserController < ApplicationController
-end
\ No newline at end of file
diff --git a/app/controllers/poll_vote_controller.rb b/app/controllers/poll_vote_controller.rb
deleted file mode 100644
index e77bdc622..000000000
--- a/app/controllers/poll_vote_controller.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-class PollVoteController < ApplicationController
-end
\ No newline at end of file

From 475b046898373a5eb8f628dacf852c5516424303 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 12 Jan 2015 16:56:53 +0800
Subject: [PATCH 005/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BF=E9=97=AEpol?=
 =?UTF-8?q?l#index=E6=8A=A5ArgumentError?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb | 89 ++++++++++++++++++++++++++++++
 app/views/poll/index.html.erb      |  8 +--
 config/locales/zh.yml              |  1 +
 3 files changed, 91 insertions(+), 7 deletions(-)
 create mode 100644 app/controllers/poll_controller.rb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
new file mode 100644
index 000000000..2a190166f
--- /dev/null
+++ b/app/controllers/poll_controller.rb
@@ -0,0 +1,89 @@
+class PollController < ApplicationController
+  before_filter :find_poll_and_course, :only => [:edit,:update,:destory]
+  before_filter :find_container, :only => [:new,:create, :index]
+
+  def index
+    if @course
+      @polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id}")
+      respond_to do |format|
+        format.html{render :layout => 'base_courses'}
+      end
+    elsif @project
+      #项目的问卷调查相关代码
+    end
+  end
+
+  def show
+    @poll = Poll.find params[:id]
+  end
+
+  def new
+    if @course
+      option = {
+          :polls_name => l(:label_poll_new),
+          :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,
+          :polls_description => ""
+      }
+      @poll = Poll.create option
+      if @poll
+        respond_to do |format|
+          format.html{render :layout => 'base_courses'}
+        end
+      end
+    elsif @project
+      #项目的问卷调查相关代码
+    end
+  end
+
+  def create
+
+  end
+
+  def edit
+
+  end
+
+  def update
+    @poll.polls_name = params[:polls_name]
+    if @poll.save
+      respond_to do |format|
+        format.html { redirect_to poll_index_url(:polls_type => @course.class.to_s, :polls_group_id => @course.id) }
+      end
+    else
+    end
+  end
+
+  def destroy
+    if @poll.destroy
+      respond_to do |format|
+        format.js
+      end
+    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
+end
\ No newline at end of file
diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index 4cf90d210..3c78c257e 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -1,7 +1 @@
-<% @polls.each do |poll|%>
-    <%= poll.id%>#####<%= poll.polls_name%>
-    <%= link_to l(:button_edit), edit_poll_path(poll.id)%>
-    <%= link_to(l(:button_delete), poll,
-                method: :delete, :confirm => l(:text_are_you_sure), :remote => true )  %>
-    <br/>
-<%end%>
\ No newline at end of file
+1111111111111
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 568a60cac..abf20e370 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2241,4 +2241,5 @@ zh:
   label_quote_resource_failed: ",此资源引用失败! "
   label_file_lost: 以下无法成功下载，请联系相关人员重新上传：
   label_file_exist: 该作品中有重复命名文件，请通过文件名学号和姓名信息进入该作业详细界面手动下载
+  label_poll_new: 未命名问卷
 

From d2dfff33d019de2b54cd1013c8421c5662223062 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 12 Jan 2015 17:01:39 +0800
Subject: [PATCH 006/142] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=97=AE=E5=8D=B7=E8=B0=83=E6=9F=A5=E7=9A=84?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_courses.html.erb | 4 ++++
 config/locales/zh.yml                   | 1 +
 2 files changed, 5 insertions(+)

diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 43adab15f..459fc43af 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -275,6 +275,10 @@
     </div>
 
     <div class="user_underline"></div>
+
+    <div class="user_fans">
+      <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id)%>
+    </div>
   </div>
 </div>
 <div id="content">
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index abf20e370..f3e6d4d8d 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2242,4 +2242,5 @@ zh:
   label_file_lost: 以下无法成功下载，请联系相关人员重新上传：
   label_file_exist: 该作品中有重复命名文件，请通过文件名学号和姓名信息进入该作业详细界面手动下载
   label_poll_new: 未命名问卷
+  label_poll: 问卷调查
 

From 8080ca80643c84eac04e0ba9ee140debbf8c9220 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 12 Jan 2015 17:02:35 +0800
Subject: [PATCH 007/142] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84css?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/polls.css | 40 ++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 public/stylesheets/polls.css

diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
new file mode 100644
index 000000000..8621c20dc
--- /dev/null
+++ b/public/stylesheets/polls.css
@@ -0,0 +1,40 @@
+/* CSS Document */
+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{ margin:0; padding:0;}
+div,img,tr,td{ border:0;}
+table,tr,td{border:0; cellspacing:0; cellpadding:0;}
+ul,li{ list-style-type:none}
+.cl{ clear:both; overflow:hidden; }
+a{ text-decoration:none; }
+a:hover{ text-decoration:underline; }
+.ml10{ margin-left:10px;}
+.ml20{ margin-left:20px;}
+.mr10{ margin-right:10px;}
+.fl{ float: left;}
+.fr{ float:right;}
+
+/*问卷列表*/
+.polls_content{ width:677px;}
+.polls_head{ width:677px; height:48px; background:#eaeaea;}
+.polls_head h2{ float:left; font-size:14px; color:#585858; margin:11px 0 0 10px;}
+.polls_head span{ font-weight:normal; color:#15bccf;}
+a.newbtn{ float:right; display:block; width:80px; height:30px; background:#64bdd9; color:#fff; font-size:14px; margin:10px; text-align:center;}
+a:hover.newbtn{ background:#55a1b9; text-decoration:none;}
+.polls_list ul{ padding-left:10px; border-bottom:1px dashed #c9c9c9; height:32px; padding-top:8px;}
+a.polls_title{ font-weight:bold; color:#3e6d8e;}
+a.pollsbtn{ display:block; width:66px; height:22px; text-align:center; border:1px solid #64bdd9; color:#64bdd9;}
+a:hover.pollsbtn{ background:#64bdd9; color:#fff; text-decoration:none;}
+.polls_date{  color:#666666;}
+.polls_de{ color:#6883b6;}
+/****翻页***/
+.wlist{}
+.wlist a{ float:right; border:1px solid #64bdd9; padding:0 5px; margin-left:3px; color:#64bdd9;}
+.wlist a:hover{border:1px solid #64bdd9; background-color:#64bdd9; color:#fff; text-decoration:none;}
+.wlist_select a { background-color:#48aac9; color:#fff;}
+
+/*问卷内容*/
+.polls_box{ border:1px solid #dcdcdc; padding:15px 30px 30px;}
+.ur_page_title{ font-size:16px;  text-align:center; color:#353535;}
+.ur_prefix_content{ color:#656565; text-indent:30px; margin-top:10px; }
+.ur_card{border-top:1px solid #dcdcdc;margin-top:20px;}
+.ur_title{ padding:5px 0px 15px; border-bottom:1px solid #dcdcdc; }

From f54cf536632c8b380180b07b66c92400e922971a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 12 Jan 2015 17:25:48 +0800
Subject: [PATCH 008/142] =?UTF-8?q?1.=E9=97=AE=E5=8D=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8A=A8=E6=80=81=E6=98=BE=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=202.=E9=97=AE=E5=8D=B7=E8=B0=83=E6=9F=A5=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=BC=95=E8=B5=B7base=5Fcourse=E7=9A=84=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/index.html.erb | 52 ++++++++++++++++++++++++++++++++++-
 public/stylesheets/polls.css  | 24 ++++++++--------
 2 files changed, 63 insertions(+), 13 deletions(-)

diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index 3c78c257e..68d16f4f7 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -1 +1,51 @@
-1111111111111
\ No newline at end of file
+<!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' %>
+</head>
+
+<body>
+<div class="polls_content" id="polls">
+  <div class="polls_head">
+    <h2>所有问卷
+      <span>（<%= @polls.count%>）</span>
+    </h2>
+    <a href="#" class="newbtn">新建问卷</a>
+  </div>
+  <div class="cl"></div>
+  <div class="polls_list">
+    <% @polls.each do |poll|%>
+        <ul>
+          <li>
+            <a href="#" class="polls_title fl">
+              <%= poll.polls_name%>
+            </a>
+          </li>
+          <li>
+            <a href="#" class="pollsbtn fl ml10">统计结果</a>
+          </li>
+          <li>
+            <a href="#" class="polls_de fr ml20 mr10">删除</a>
+          </li>
+          <li class="polls_date fr">
+            <%= format_time poll.created_at%>
+          </li>
+        </ul>
+        <div class="cl"></div>
+    <% end%>
+
+    <ul class="wlist" style=" border:none;">
+      <li><a href="#">下一页</a></li>
+      <li><a href="#">...</a></li>
+      <li><a href="#">2</a></li>
+      <li class="wlist_select" ><a href="#">1</a></li>
+      <li><a href="#">上一页</a></li>
+    </ul>
+    <div class="cl"></div>
+  </div><!--列表end-->
+
+</div><!--问卷内容end-->
+</body>
+</html>
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 8621c20dc..9d3059245 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -1,17 +1,17 @@
 /* CSS Document */
-body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+#polls{ 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{ margin:0; padding:0;}
-div,img,tr,td{ border:0;}
-table,tr,td{border:0; cellspacing:0; cellpadding:0;}
-ul,li{ list-style-type:none}
-.cl{ clear:both; overflow:hidden; }
-a{ text-decoration:none; }
-a:hover{ text-decoration:underline; }
-.ml10{ margin-left:10px;}
-.ml20{ margin-left:20px;}
-.mr10{ margin-right:10px;}
-.fl{ float: left;}
-.fr{ float:right;}
+#polls div,img,tr,td{ border:0;}
+#polls table,tr,td{border:0; cellspacing:0; cellpadding:0;}
+#polls ul,li{ list-style-type:none}
+#polls .cl{ clear:both; overflow:hidden; }
+#polls a{ text-decoration:none; }
+#polls a:hover{ text-decoration:underline; }
+#polls .ml10{ margin-left:10px;}
+#polls .ml20{ margin-left:20px;}
+#polls .mr10{ margin-right:10px;}
+#polls .fl{ float: left;}
+#polls .fr{ float:right;}
 
 /*问卷列表*/
 .polls_content{ width:677px;}

From 450c4b203dd2138cd3919ecb730b4bd29765eb41 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 12 Jan 2015 17:30:33 +0800
Subject: [PATCH 009/142] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E6=8C=89=E9=92=AE=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/index.html.erb | 2 +-
 app/views/poll/new.html.erb   | 1 +
 config/locales/zh.yml         | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index 68d16f4f7..7c1529406 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -12,7 +12,7 @@
     <h2>所有问卷
       <span>（<%= @polls.count%>）</span>
     </h2>
-    <a href="#" class="newbtn">新建问卷</a>
+    <%= link_to l(:label_new_poll), new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => "newbtn" %>
   </div>
   <div class="cl"></div>
   <div class="polls_list">
diff --git a/app/views/poll/new.html.erb b/app/views/poll/new.html.erb
index e69de29bb..9d07aa0df 100644
--- a/app/views/poll/new.html.erb
+++ b/app/views/poll/new.html.erb
@@ -0,0 +1 @@
+111
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index f3e6d4d8d..b6a293c6a 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2243,4 +2243,5 @@ zh:
   label_file_exist: 该作品中有重复命名文件，请通过文件名学号和姓名信息进入该作业详细界面手动下载
   label_poll_new: 未命名问卷
   label_poll: 问卷调查
+  label_new_poll: 新建问卷
 

From d0dc01b99215177f7495e8fad7090277e9a96c72 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 12 Jan 2015 17:55:22 +0800
Subject: [PATCH 010/142] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb | 4 ++--
 app/views/poll/destroy.js.erb      | 5 ++++-
 app/views/poll/index.html.erb      | 9 ++++++---
 config/locales/zh.yml              | 1 +
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 2a190166f..5f0119022 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -1,5 +1,5 @@
 class PollController < ApplicationController
-  before_filter :find_poll_and_course, :only => [:edit,:update,:destory]
+  before_filter :find_poll_and_course, :only => [:edit,:update,:destroy]
   before_filter :find_container, :only => [:new,:create, :index]
 
   def index
@@ -59,7 +59,7 @@ class PollController < ApplicationController
   end
 
   def destroy
-    if @poll.destroy
+    if @poll && @poll.destroy
       respond_to do |format|
         format.js
       end
diff --git a/app/views/poll/destroy.js.erb b/app/views/poll/destroy.js.erb
index a9efe790e..abfecb167 100644
--- a/app/views/poll/destroy.js.erb
+++ b/app/views/poll/destroy.js.erb
@@ -1 +1,4 @@
-alert("删除成功");
\ No newline at end of file
+<% if @poll%>
+    $("#polls_<%= @poll.id%>").remove();
+<%else%>
+<% end %>
diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index 7c1529406..39230774b 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -17,17 +17,20 @@
   <div class="cl"></div>
   <div class="polls_list">
     <% @polls.each do |poll|%>
-        <ul>
+        <ul id="polls_<%= poll.id %>">
           <li>
             <a href="#" class="polls_title fl">
               <%= poll.polls_name%>
             </a>
           </li>
           <li>
-            <a href="#" class="pollsbtn fl ml10">统计结果</a>
+            <a href="#" class="pollsbtn fl ml10">
+              <%= l(:label_statistical_results)%>
+            </a>
           </li>
           <li>
-            <a href="#" class="polls_de fr ml20 mr10">删除</a>
+            <%= link_to(l(:button_delete), poll,
+                        method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml20 mr10")  %>
           </li>
           <li class="polls_date fr">
             <%= format_time poll.created_at%>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index b6a293c6a..7c93f8e98 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2244,4 +2244,5 @@ zh:
   label_poll_new: 未命名问卷
   label_poll: 问卷调查
   label_new_poll: 新建问卷
+  label_statistical_results: 统计结果
 

From 245f1a165c12c4bf16f2d6f34e24fb0f31bb8c2d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 13 Jan 2015 08:48:38 +0800
Subject: [PATCH 011/142] =?UTF-8?q?=E6=9B=B4=E6=96=B0css=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/polls.css | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 9d3059245..7af93b999 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -32,9 +32,34 @@ a:hover.pollsbtn{ background:#64bdd9; color:#fff; text-decoration:none;}
 .wlist a:hover{border:1px solid #64bdd9; background-color:#64bdd9; color:#fff; text-decoration:none;}
 .wlist_select a { background-color:#48aac9; color:#fff;}
 
-/*问卷内容*/
-.polls_box{ border:1px solid #dcdcdc; padding:15px 30px 30px;}
+/*问卷页面*/
+.polls_box{ border:1px solid #dcdcdc; padding:15px 30px;}
 .ur_page_title{ font-size:16px;  text-align:center; color:#353535;}
 .ur_prefix_content{ color:#656565; text-indent:30px; margin-top:10px; }
-.ur_card{border-top:1px solid #dcdcdc;margin-top:20px;}
-.ur_title{ padding:5px 0px 15px; border-bottom:1px solid #dcdcdc; }
+.ur_card{border-top:1px solid #dcdcdc;margin-top:20px; color:#3a3a3a;}
+.ur_title{ padding:20px 0px ;  }
+.ur_required{ font-weight: bold; color:red;}
+.ur_inputs{ color:#666;}
+.ur_table{border-top:1px solid #dcdcdc;}
+.ur_inputs tr td{ height:40px;border-bottom:1px solid #dcdcdc; width:677px;}
+.ur_inputs label{ padding-left:10px;}
+.ur_inputs input{ margin-right:5px;}
+.ur_text{ height:30px;}
+.ur_textbox{ border:1px solid #dcdcdc; color:#676765;}
+.ur_buttons{ width:250px; margin:20px auto 10px;}
+a.ur_button{ display:block; width:106px; height:37px; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:3px;  float:left; margin-right:15px;}
+a:hover.ur_button{ background:#0fa9bb; text-decoration:none;}
+.ur_progress_text{ text-align:center; font-size:14px;}
+
+/*问卷结果*/
+.title_index{ color:#62bcd7;}
+.ur_title_result{ padding-top:20px;}
+.ur_table_result{ color:#5d5d5d;border-right:1px solid #cbcbcb;border-bottom:1px solid #cbcbcb;}
+.ur_table_result tr td{ border-left:1px solid #cbcbcb;border-top:1px solid #cbcbcb; height:20px;}
+.table_bluebg{ background:#d7e5ee; color:#2f3a40; height:24px;}
+.td327{ width:334px; padding-left:5px;}
+.td42{ width:42px; text-align:center;}
+.td287{ width:287px;padding-left:5px; }
+.Bar{ position: relative; width: 120px; border: 1px solid #cbcbcb; float:left; height:10px; margin-top:5px; margin-right:3px; }
+.Bar span{ display: block; position: relative;background:#64badb;/* 进度条背景颜色 */ color: #333333;height: 10px; /* 高度 */ line-height: 20px; }
+.ur_progress_text{ color:##3a3a3a;}

From 6f19dd6c5cf9998c27ccb7781fbaf2540f90a027 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 13 Jan 2015 08:51:05 +0800
Subject: [PATCH 012/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9css=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E8=AF=AD=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/polls.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 7af93b999..c83ef6833 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -62,4 +62,4 @@ a:hover.ur_button{ background:#0fa9bb; text-decoration:none;}
 .td287{ width:287px;padding-left:5px; }
 .Bar{ position: relative; width: 120px; border: 1px solid #cbcbcb; float:left; height:10px; margin-top:5px; margin-right:3px; }
 .Bar span{ display: block; position: relative;background:#64badb;/* 进度条背景颜色 */ color: #333333;height: 10px; /* 高度 */ line-height: 20px; }
-.ur_progress_text{ color:##3a3a3a;}
+.ur_progress_text{ color:#3a3a3a;}

From 32219bd8502737baff06f239109451a274875776 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 13 Jan 2015 10:23:26 +0800
Subject: [PATCH 013/142] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BF=E9=97=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb | 11 +++++++++++
 app/views/poll/destroy.js.erb      |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 5f0119022..cb01c573e 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -1,9 +1,12 @@
 class PollController < ApplicationController
   before_filter :find_poll_and_course, :only => [:edit,:update,:destroy]
   before_filter :find_container, :only => [:new,:create, :index]
+  before_filter :is_member_of_course, :only => [:index,:show]
+  before_filter :is_course_teacher, :only => [:new,:create,:edit,:update,:destroy]
 
   def index
     if @course
+      @is_teacher = User.current.allowed_to?(:as_teacher,course)
       @polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id}")
       respond_to do |format|
         format.html{render :layout => 'base_courses'}
@@ -86,4 +89,12 @@ class PollController < ApplicationController
       render_404
     end
   end
+
+  def is_member_of_course
+    render_403 unless(@course && User.current.member_of_course?(@course))
+  end
+
+  def is_course_teacher
+    render_403 unless(@course && User.current.allowed_to?(:as_teacher,course))
+  end
 end
\ No newline at end of file
diff --git a/app/views/poll/destroy.js.erb b/app/views/poll/destroy.js.erb
index abfecb167..cf94b5661 100644
--- a/app/views/poll/destroy.js.erb
+++ b/app/views/poll/destroy.js.erb
@@ -1,4 +1,4 @@
 <% if @poll%>
     $("#polls_<%= @poll.id%>").remove();
 <%else%>
-<% end %>
+<% end %>
\ No newline at end of file

From a18fa10de529208c4e264c94bb7c308481d2e1d2 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 13 Jan 2015 11:44:28 +0800
Subject: [PATCH 014/142] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E8=80=81=E5=B8=88?=
 =?UTF-8?q?=E5=92=8C=E5=AD=A6=E7=94=9F=E6=98=BE=E7=A4=BA=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E5=8C=BA=E5=88=AB=202.=E5=A2=9E=E5=8A=A0=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E7=9A=84=E5=8A=A8=E6=80=81=E6=98=BE=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=88=86=E9=A1=B5=E7=9B=B8=E5=85=B3css?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb |  7 ++++---
 app/views/poll/index.html.erb      | 22 +++++++++++-----------
 public/stylesheets/polls.css       |  9 +++++----
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index cb01c573e..d4e2517e7 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -6,8 +6,9 @@ class PollController < ApplicationController
 
   def index
     if @course
-      @is_teacher = User.current.allowed_to?(:as_teacher,course)
-      @polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id}")
+      @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+      polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id}")
+      @polls = paginateHelper polls,10 #分页
       respond_to do |format|
         format.html{render :layout => 'base_courses'}
       end
@@ -95,6 +96,6 @@ class PollController < ApplicationController
   end
 
   def is_course_teacher
-    render_403 unless(@course && User.current.allowed_to?(:as_teacher,course))
+    render_403 unless(@course && User.current.allowed_to?(:as_teacher,@course))
   end
 end
\ No newline at end of file
diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index 39230774b..fc36a8abf 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -24,13 +24,17 @@
             </a>
           </li>
           <li>
-            <a href="#" class="pollsbtn fl ml10">
-              <%= l(:label_statistical_results)%>
-            </a>
+            <%if @is_teacher%>
+                <a href="#" class="pollsbtn fl ml10">
+                  <%= l(:label_statistical_results)%>
+                </a>
+            <% end%>
           </li>
           <li>
-            <%= link_to(l(:button_delete), poll,
-                        method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml20 mr10")  %>
+            <% 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 class="polls_date fr">
             <%= format_time poll.created_at%>
@@ -39,12 +43,8 @@
         <div class="cl"></div>
     <% end%>
 
-    <ul class="wlist" style=" border:none;">
-      <li><a href="#">下一页</a></li>
-      <li><a href="#">...</a></li>
-      <li><a href="#">2</a></li>
-      <li class="wlist_select" ><a href="#">1</a></li>
-      <li><a href="#">上一页</a></li>
+    <ul class="wlist">
+      <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
     </ul>
     <div class="cl"></div>
   </div><!--列表end-->
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index c83ef6833..494d9cb60 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -27,10 +27,11 @@ a:hover.pollsbtn{ background:#64bdd9; color:#fff; text-decoration:none;}
 .polls_date{  color:#666666;}
 .polls_de{ color:#6883b6;}
 /****翻页***/
-.wlist{}
-.wlist a{ float:right; border:1px solid #64bdd9; padding:0 5px; margin-left:3px; color:#64bdd9;}
-.wlist a:hover{border:1px solid #64bdd9; background-color:#64bdd9; color:#fff; text-decoration:none;}
-.wlist_select a { background-color:#48aac9; color:#fff;}
+ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
+ul.wlist li{float: left;}
+ul.wlist li a{ border:1px solid #15bccf; padding:4px; margin-left:3px;}
+ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
+.wlist_select { background-color:#64bdd9; color:#fff; padding:0 5px; margin-left:3px;margin-top: -2px; border:1px solid #64bdd9;}
 
 /*问卷页面*/
 .polls_box{ border:1px solid #dcdcdc; padding:15px 30px;}

From d8e6b4a92f4a1f116e348f8152980d4489a7ae69 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 13 Jan 2015 11:54:07 +0800
Subject: [PATCH 015/142] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=97=AE=E5=8D=B7=E6=8C=89=E9=92=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=20=E4=BF=AE=E6=94=B9=E9=97=AE=E5=8D=B7=E6=80=BB?=
 =?UTF-8?q?=E6=95=B0=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/index.html.erb | 6 ++++--
 public/stylesheets/polls.css  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index fc36a8abf..0b49cd92d 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -10,9 +10,11 @@
 <div class="polls_content" id="polls">
   <div class="polls_head">
     <h2>所有问卷
-      <span>（<%= @polls.count%>）</span>
+      <span>（<%= @obj_count%>）</span>
     </h2>
-    <%= link_to l(:label_new_poll), new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => "newbtn" %>
+    <% if @is_teacher%>
+        <%= link_to l(:label_new_poll), new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => "newbtn" %>
+    <% end%>
   </div>
   <div class="cl"></div>
   <div class="polls_list">
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 494d9cb60..641d1726d 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -31,7 +31,7 @@ ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
 ul.wlist li{float: left;}
 ul.wlist li a{ border:1px solid #15bccf; padding:4px; margin-left:3px;}
 ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
-.wlist_select { background-color:#64bdd9; color:#fff; padding:0 5px; margin-left:3px;margin-top: -2px; border:1px solid #64bdd9;}
+.wlist_select { background-color:#64bdd9; color:#fff; padding: 1px 5px 0px 5px; margin-left:3px;margin-top: -2px; border:1px solid #64bdd9;}
 
 /*问卷页面*/
 .polls_box{ border:1px solid #dcdcdc; padding:15px 30px;}

From fc72d6f9a9710256f70ee98a9a9db4030b1bcceb Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 13 Jan 2015 15:59:02 +0800
Subject: [PATCH 016/142] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E3=80=81=E9=97=AE=E5=8D=B7=E7=AD=94=E5=8D=B7?=
 =?UTF-8?q?=E7=AD=89=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=BA=94=E8=B7=AF=E7=94=B1=202.?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=203.?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb        |  13 +-
 app/views/poll/index.html.erb             |  22 +--
 app/views/poll/show.html.erb              | 114 +++++++++++
 app/views/poll/statistics_result.html.erb | 220 ++++++++++++++++++++++
 config/routes.rb                          |   6 +-
 public/stylesheets/polls.css              |   2 +-
 6 files changed, 356 insertions(+), 21 deletions(-)
 create mode 100644 app/views/poll/show.html.erb
 create mode 100644 app/views/poll/statistics_result.html.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index d4e2517e7..e5b1025a4 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -1,5 +1,5 @@
 class PollController < ApplicationController
-  before_filter :find_poll_and_course, :only => [:edit,:update,:destroy]
+  before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result]
   before_filter :find_container, :only => [:new,:create, :index]
   before_filter :is_member_of_course, :only => [:index,:show]
   before_filter :is_course_teacher, :only => [:new,:create,:edit,:update,:destroy]
@@ -19,6 +19,11 @@ class PollController < ApplicationController
 
   def show
     @poll = Poll.find params[:id]
+    @poll_questions = @poll.poll_questions
+
+    respond_to do |format|
+      format.html {render :layout => 'base_courses'}
+    end
   end
 
   def new
@@ -70,6 +75,12 @@ class PollController < ApplicationController
     end
   end
 
+  def statistics_result
+    respond_to do |format|
+      format.html{render :layout => 'base_courses'}
+    end
+  end
+
   private
   def find_poll_and_course
     @poll = Poll.find params[:id]
diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index 0b49cd92d..79f930565 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -1,12 +1,4 @@
-<!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' %>
-</head>
-
-<body>
+<%= stylesheet_link_tag  'polls', :media => 'all' %>
 <div class="polls_content" id="polls">
   <div class="polls_head">
     <h2>所有问卷
@@ -21,15 +13,11 @@
     <% @polls.each do |poll|%>
         <ul id="polls_<%= poll.id %>">
           <li>
-            <a href="#" class="polls_title fl">
-              <%= poll.polls_name%>
-            </a>
+            <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
           </li>
           <li>
             <%if @is_teacher%>
-                <a href="#" class="pollsbtn fl ml10">
-                  <%= l(:label_statistical_results)%>
-                </a>
+                <%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fl ml10"%>
             <% end%>
           </li>
           <li>
@@ -51,6 +39,4 @@
     <div class="cl"></div>
   </div><!--列表end-->
 
-</div><!--问卷内容end-->
-</body>
-</html>
+</div><!--问卷内容end-->
\ No newline at end of file
diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
new file mode 100644
index 000000000..66fcd3bcd
--- /dev/null
+++ b/app/views/poll/show.html.erb
@@ -0,0 +1,114 @@
+<!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' %>
+</head>
+
+<body>
+<div class="polls_content polls_box" id="polls">
+  <div class="ur_page_head" >
+    <h1 class="ur_page_title">
+      <%= @poll.polls_name%>
+    </h1>
+    <p class="ur_prefix_content">
+      <%= @poll.polls_description %>
+    </p>
+  </div>
+
+
+  <div class="ur_card">
+    <ol class="ur_questions">
+
+      <li class="ur_question_item radio">
+        <div class="ur_title">
+          <span class="title_index">第1题：</span> 单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题  <span class="ur_required" title="必答">*</span>
+        </div>
+        <div class="ur_inputs">
+          <table class="ur_table" >
+            <tbody>
+            <tr>
+              <td>
+                <label ><input class="ur_radio" type="radio" value="新建选项" > 新建选项</label>
+              </td>
+            </tr>
+            <tr >
+              <td>
+                <label ><input class="ur_radio" type="radio" value="新建选项" > 新建选项</label>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <label ><input class="ur_radio" type="radio" value="新建选项" > 新建选项</label>
+              </td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
+      </li><!--单选题 end-->
+
+      <li  class="ur_question_item checkbox">
+        <div class="ur_title">
+          <span class="title_index">第2题：</span> 多选题  <span class="ur_required" title="必答">*</span>
+        </div>
+        <div class="ur_inputs">
+          <table class="ur_table">
+            <tbody>
+            <tr>
+              <td>
+                <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
+              </td>
+            </tr>
+            <tr class="ur_tr_even">
+              <td>
+                <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
+              </td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
+      </li><!--多选题 end-->
+
+
+      <li  class="ur_question_item text">
+        <div class="ur_title">
+          <span class="title_index">第3题：</span> 单行主观
+        </div>
+        <div class="ur_inputs">
+          <input class="ur_text ur_textbox" type="text" size="" maxlength=""value="">
+        </div>
+      </li><!--当行输入 end-->
+
+      <li class="ur_question_item textarea">
+        <div class="ur_preview">
+          <div class="ur_title">
+            <span class="title_index">第4题：</span> 多行主观
+          </div>
+          <div class="ur_inputs">
+            <textarea  class="ur_textbox"  rows="5" cols="60"></textarea>
+          </div>
+        </div>
+      </li><!--多行输入 end-->
+
+    </ol>
+
+    <div class="ur_buttons">
+      <a href="#" class=" ur_button"  >下一页</a>
+      <a href="#" class="ur_button" >提交</a>
+    </div>
+    <div class="cl"></div>
+    <div class="ur_progress_text">答题已完成 <strong class="ur_progress_number">0%</strong> </div>
+
+  </div>
+
+
+
+</div><!--问卷内容end-->
+</body>
+</html>
diff --git a/app/views/poll/statistics_result.html.erb b/app/views/poll/statistics_result.html.erb
new file mode 100644
index 000000000..f07d17215
--- /dev/null
+++ b/app/views/poll/statistics_result.html.erb
@@ -0,0 +1,220 @@
+<!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' %>
+</head>
+
+<body>
+<div class="polls_content polls_box">
+<div class="ur_page_head" >
+  <h1 class="ur_page_title">某问卷统计</h1>
+</div>
+
+
+<div class="">
+  <ol>
+    <li class="ur_question_item">
+      <div class="ur_title_result">
+        <span class="title_index">第1题：</span>问题描述问题描述 <span class="title_index">[单选题]</span>
+      </div>
+      <div class="ur_table_result">
+        <table  border="0" cellspacing="0" cellpadding="0" >
+          <tbody>
+          <tr class="table_bluebg">
+            <td class="td327">选项 </td>
+            <td class="td42">小计 </td>
+            <td class="td287">比例 </td>
+          </tr>
+          <tr>
+            <td class="td327">第一选项 </td>
+            <td class="td42">24 </td>
+            <td class="td287"><div class="Bar"><span style="width:75%;"></span></div> 75% </td>
+          </tr>
+          <tr>
+            <td class="td327">第二选项 </td>
+            <td class="td42">1 </td>
+            <td class="td287"><div class="Bar"><span style="width:3.13%;"></span></div>3.13% </td>
+          </tr>
+          <tr>
+            <td class="td327">第三选项 </td>
+            <td class="td42">1</td>
+            <td class="td287"><div class="Bar"><span style="width:3.13%;"></span></div>3.13% </td>
+          </tr>
+          <tr class="table_bluebg">
+            <td class="td327">本题有效填写人次 </td>
+            <td class="td42">26</td>
+            <td class="td287">&nbsp; </td>
+          </tr>
+          </tbody>
+        </table>
+      </div>
+    </li>
+    <li class="ur_question_item">
+      <div class="ur_title_result">
+        <span class="title_index">第1题：</span>问题描述问题描述 <span class="title_index">[单选题]</span>
+      </div>
+      <div class="ur_table_result">
+        <table  border="0" cellspacing="0" cellpadding="0" >
+          <tbody>
+          <tr class="table_bluebg">
+            <td class="td327">选项 </td>
+            <td class="td42">小计 </td>
+            <td class="td287">比例 </td>
+          </tr>
+          <tr>
+            <td class="td327">第一选项 </td>
+            <td class="td42">24 </td>
+            <td class="td287"><div class="Bar"><span style="width:75%;"></span></div> 75% </td>
+          </tr>
+          <tr>
+            <td class="td327">第二选项 </td>
+            <td class="td42">1 </td>
+            <td class="td287"><div class="Bar"><span style="width:3.13%;"></span></div>3.13% </td>
+          </tr>
+          <tr>
+            <td class="td327">第三选项 </td>
+            <td class="td42">1</td>
+            <td class="td287"><div class="Bar"><span style="width:3.13%;"></span></div>3.13% </td>
+          </tr>
+          <tr class="table_bluebg">
+            <td class="td327">本题有效填写人次 </td>
+            <td class="td42">26</td>
+            <td class="td287">&nbsp; </td>
+          </tr>
+          </tbody>
+        </table>
+      </div>
+    </li>
+    <li class="ur_question_item">
+      <div class="ur_title_result">
+        <span class="title_index">第1题：</span>问题描述问题描述 <span class="title_index">[单选题]</span>
+      </div>
+      <div class="ur_table_result">
+        <table  border="0" cellspacing="0" cellpadding="0" >
+          <tbody>
+          <tr class="table_bluebg">
+            <td class="td327">选项 </td>
+            <td class="td42">小计 </td>
+            <td class="td287">比例 </td>
+          </tr>
+          <tr>
+            <td class="td327">第一选项 </td>
+            <td class="td42">24 </td>
+            <td class="td287"><div class="Bar"><span style="width:75%;"></span></div> 75% </td>
+          </tr>
+          <tr>
+            <td class="td327">第二选项 </td>
+            <td class="td42">1 </td>
+            <td class="td287"><div class="Bar"><span style="width:3.13%;"></span></div>3.13% </td>
+          </tr>
+          <tr>
+            <td class="td327">第三选项 </td>
+            <td class="td42">1</td>
+            <td class="td287"><div class="Bar"><span style="width:3.13%;"></span></div>3.13% </td>
+          </tr>
+          <tr class="table_bluebg">
+            <td class="td327">本题有效填写人次 </td>
+            <td class="td42">26</td>
+            <td class="td287">&nbsp; </td>
+          </tr>
+          </tbody>
+        </table>
+      </div>
+    </li>
+    <li class="ur_question_item">
+      <div class="ur_title_result">
+        <span class="title_index">第1题：</span>问题描述问题描述 <span class="title_index">[单选题]</span>
+      </div>
+      <div class="ur_table_result">
+        <table  border="0" cellspacing="0" cellpadding="0" >
+          <tbody>
+          <tr class="table_bluebg">
+            <td class="td327">选项 </td>
+            <td class="td42">小计 </td>
+            <td class="td287">比例 </td>
+          </tr>
+          <tr>
+            <td class="td327">第一选项 </td>
+            <td class="td42">24 </td>
+            <td class="td287"><div class="Bar"><span style="width:75%;"></span></div> 75% </td>
+          </tr>
+          <tr>
+            <td class="td327">第二选项 </td>
+            <td class="td42">1 </td>
+            <td class="td287"><div class="Bar"><span style="width:3.13%;"></span></div>3.13% </td>
+          </tr>
+          <tr>
+            <td class="td327">第三选项 </td>
+            <td class="td42">1</td>
+            <td class="td287"><div class="Bar"><span style="width:3.13%;"></span></div>3.13% </td>
+          </tr>
+          <tr class="table_bluebg">
+            <td class="td327">本题有效填写人次 </td>
+            <td class="td42">26</td>
+            <td class="td287">&nbsp; </td>
+          </tr>
+          </tbody>
+        </table>
+      </div>
+    </li>
+    <li class="ur_question_item">
+      <div class="ur_title_result">
+        <span class="title_index">第1题：</span>问题描述问题描述 <span class="title_index">[单选题]</span>
+      </div>
+      <div class="ur_table_result">
+        <table  border="0" cellspacing="0" cellpadding="0" >
+          <tbody>
+          <tr class="table_bluebg">
+            <td class="td327">选项 </td>
+            <td class="td42">小计 </td>
+            <td class="td287">比例 </td>
+          </tr>
+          <tr>
+            <td class="td327">第一选项 </td>
+            <td class="td42">24 </td>
+            <td class="td287"><div class="Bar"><span style="width:75%;"></span></div> 75% </td>
+          </tr>
+          <tr>
+            <td class="td327">第二选项 </td>
+            <td class="td42">1 </td>
+            <td class="td287"><div class="Bar"><span style="width:3.13%;"></span></div>3.13% </td>
+          </tr>
+          <tr>
+            <td class="td327">第三选项 </td>
+            <td class="td42">1</td>
+            <td class="td287"><div class="Bar"><span style="width:3.13%;"></span></div>3.13% </td>
+          </tr>
+          <tr class="table_bluebg">
+            <td class="td327">本题有效填写人次 </td>
+            <td class="td42">26</td>
+            <td class="td287">&nbsp; </td>
+          </tr>
+          </tbody>
+        </table>
+      </div>
+    </li>
+
+
+
+
+
+
+
+
+  </ol>
+  <div class="ur_buttons">
+    <!--<a href="#" class=" ur_button"  >上一页</a>-->
+    <!--<a href="#" class="ur_button" >下一页</a>-->
+  </div>
+  <div class="cl"></div>
+  <div class="ur_progress_text">答题已完成 <strong class="ur_progress_number">0%</strong> </div>
+
+</div>
+
+
+
+</div><!--问卷内容end-->
+</body>
+</html>
diff --git a/config/routes.rb b/config/routes.rb
index 911a0643f..617a5ade4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -58,7 +58,11 @@ RedmineApp::Application.routes.draw do
     end
   end
 
-  resources :poll
+  resources :poll do
+    member do
+      get 'statistics_result'
+    end
+  end
 
   resources :contest_notification
 
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 641d1726d..3ace9e459 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -46,7 +46,7 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
 .ur_inputs label{ padding-left:10px;}
 .ur_inputs input{ margin-right:5px;}
 .ur_text{ height:30px;}
-.ur_textbox{ border:1px solid #dcdcdc; color:#676765;}
+.ur_textbox{ border:1px solid #dcdcdc !important; color:#676765;}
 .ur_buttons{ width:250px; margin:20px auto 10px;}
 a.ur_button{ display:block; width:106px; height:37px; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:3px;  float:left; margin-right:15px;}
 a:hover.ur_button{ background:#0fa9bb; text-decoration:none;}

From 8503f0c8030997ba050999e61e9e58a7761d6590 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 13 Jan 2015 16:58:44 +0800
Subject: [PATCH 017/142] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=9C=80=E6=96=B0?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4css=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/index.html.erb             |  2 +-
 app/views/poll/statistics_result.html.erb | 10 +---
 public/stylesheets/polls.css              | 59 +++++++++++++++++++++--
 3 files changed, 56 insertions(+), 15 deletions(-)

diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index 79f930565..150c13382 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -1,5 +1,5 @@
 <%= stylesheet_link_tag  'polls', :media => 'all' %>
-<div class="polls_content" id="polls">
+<div class="polls_content" id="polls" style="width:677px;">
   <div class="polls_head">
     <h2>所有问卷
       <span>（<%= @obj_count%>）</span>
diff --git a/app/views/poll/statistics_result.html.erb b/app/views/poll/statistics_result.html.erb
index f07d17215..164020cde 100644
--- a/app/views/poll/statistics_result.html.erb
+++ b/app/views/poll/statistics_result.html.erb
@@ -7,7 +7,7 @@
 </head>
 
 <body>
-<div class="polls_content polls_box">
+<div class="polls_content polls_box" id="polls">
 <div class="ur_page_head" >
   <h1 class="ur_page_title">某问卷统计</h1>
 </div>
@@ -195,14 +195,6 @@
         </table>
       </div>
     </li>
-
-
-
-
-
-
-
-
   </ol>
   <div class="ur_buttons">
     <!--<a href="#" class=" ur_button"  >上一页</a>-->
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 3ace9e459..99e88c98d 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -14,7 +14,7 @@ div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margi
 #polls .fr{ float:right;}
 
 /*问卷列表*/
-.polls_content{ width:677px;}
+.polls_content{ width:615px;}
 .polls_head{ width:677px; height:48px; background:#eaeaea;}
 .polls_head h2{ float:left; font-size:14px; color:#585858; margin:11px 0 0 10px;}
 .polls_head span{ font-weight:normal; color:#15bccf;}
@@ -33,16 +33,17 @@ ul.wlist li a{ border:1px solid #15bccf; padding:4px; margin-left:3px;}
 ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
 .wlist_select { background-color:#64bdd9; color:#fff; padding: 1px 5px 0px 5px; margin-left:3px;margin-top: -2px; border:1px solid #64bdd9;}
 
+
 /*问卷页面*/
 .polls_box{ border:1px solid #dcdcdc; padding:15px 30px;}
 .ur_page_title{ font-size:16px;  text-align:center; color:#353535;}
 .ur_prefix_content{ color:#656565; text-indent:30px; margin-top:10px; }
 .ur_card{border-top:1px solid #dcdcdc;margin-top:20px; color:#3a3a3a;}
-.ur_title{ padding:20px 0px ;  }
+.ur_title{ padding:20px 0px ; float:left; width:604px; }
 .ur_required{ font-weight: bold; color:red;}
 .ur_inputs{ color:#666;}
 .ur_table{border-top:1px solid #dcdcdc;}
-.ur_inputs tr td{ height:40px;border-bottom:1px solid #dcdcdc; width:677px;}
+.ur_inputs tr td{ height:40px;border-bottom:1px solid #dcdcdc; width:617px;}
 .ur_inputs label{ padding-left:10px;}
 .ur_inputs input{ margin-right:5px;}
 .ur_text{ height:30px;}
@@ -58,9 +59,57 @@ a:hover.ur_button{ background:#0fa9bb; text-decoration:none;}
 .ur_table_result{ color:#5d5d5d;border-right:1px solid #cbcbcb;border-bottom:1px solid #cbcbcb;}
 .ur_table_result tr td{ border-left:1px solid #cbcbcb;border-top:1px solid #cbcbcb; height:20px;}
 .table_bluebg{ background:#d7e5ee; color:#2f3a40; height:24px;}
-.td327{ width:334px; padding-left:5px;}
+.td327{ width:300px; padding-left:5px;}
 .td42{ width:42px; text-align:center;}
-.td287{ width:287px;padding-left:5px; }
+.td287{ width:259px;padding-left:5px; }
 .Bar{ position: relative; width: 120px; border: 1px solid #cbcbcb; float:left; height:10px; margin-top:5px; margin-right:3px; }
 .Bar span{ display: block; position: relative;background:#64badb;/* 进度条背景颜色 */ color: #333333;height: 10px; /* 高度 */ line-height: 20px; }
 .ur_progress_text{ color:#3a3a3a;}
+
+/*问卷编辑*/
+.polls_edit{ color:#767676;}
+a:hover{ text-decoration:none; cursor:pointer;}
+.tabs{ width:665px; height: auto; border:1px solid #cbcbcb; padding:10px 0 0 10px; margin-bottom:10px;}
+.tab_item { float:left; height:30px; background:#eeeeee; margin-right:4px; padding:0 8px; margin-bottom:10px;}
+.icon_delete{ font-size:16px;}
+a:hover.icon_delete{ font-weight: bold;}
+.current{ color:#4f4f4d; background:#c4c4c4;}
+.tab_add{float:left;  width:22px; height:22px; border:1px solid #cbcbcb; margin-top:6px; }
+.icon_page_add{ background:url(../images/icons.png) 4px -314px no-repeat; width:22px; height:27px; display:block;}
+a:hover.icon_page_add{ background:url(../images/icons.png) -16px -314px no-repeat;}
+.tab_item02{ float:left; width:141px; height:30px;background:#eeeeee; margin-right:10px; padding:0 10px; margin-bottom:10px; padding:10px 0 0 15px;}
+.tab_item02:hover{ background:#c9c9c9;}
+.tab_icon{padding-left:25px;}
+a:hover.tab_item02{ background:#fff;}
+.icon_radio{background:url(../images/icons.png) 0px 0px no-repeat; }
+.icon_checkbox{background:url(../images/icons.png) 0px -40px no-repeat; }
+.icon_text{background:url(../images/icons.png) 0px -80px no-repeat; }
+.icon_textarea{background:url(../images/icons.png) 0px -120px no-repeat; }
+
+.ur_editor {width:655px; border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px;}
+.ur_title_editor_title{ margin-bottom:10px;}
+.input_title{ width:630px; height:40px; padding:0 10px; text-align:center; font-size:16px; font-weight:bold;}
+.textarea_editor{  width:632px; height:120px; padding:10px; margin-bottom:10px;}
+.btn_submit{ width:56px; height:24px;  padding-top:4px;background:#15bccf; color:#fff; text-align:center; display:block; float:left; margin-right:10px;}
+a:hover.btn_submit{background:#0fa9bb;}
+.btn_cancel{width:54px; height:22px;  padding-top:4px;background:#fff; color:#999; border:1px solid #999; text-align:center; display:block; float:left; }
+a:hover.btn_cancel{ color:#666;}
+.ur_question_title{ width:534px; height:30px; border:1px solid #cbcbcb; padding-left:5px; margin-right:10px;}
+.ur_editor_title{ margin-bottom:10px;}
+.ur_editor_content{ }
+.ur_item{ margin-bottom:5px; height:32px; }
+.ur_item input{ width:324px; height:30px;border:1px solid #cbcbcb; padding-left:5px; float:left; margin-right:10px; }
+.ur_item label{ float:left;}
+.icon_add{ background:url(../images/icons.png) 0px -310px no-repeat; width:16px; height:27px; display:block;float:left; margin-right:5px;}
+a:hover.icon_add{background:url(../images/icons.png) -20px -310px no-repeat;}
+.icon_remove{background:url(../images/icons.png) 0px -338px no-repeat; width:16px; height:27px; display:block;float:left;}
+a:hover.icon_remove{background:url(../images/icons.png) -20px -338px no-repeat;}
+.ur_editor_toolbar{ margin-bottom:10px;}
+.ur_editor_toolbar input{ width:40px; height:20px;}
+.ur_editor02{width:655px; border:1px solid #cbcbcb; padding:10px; margin-bottom:10px;}
+a.ur_button_submit{ display:block; width:106px; height:37px; margin:0 auto; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:3px; margin-bottom:10px; }
+a:hover.ur_button_submit{ background:#0fa9bb; text-decoration:none;}
+a.ur_icon_de{ background:url(../images/icons.png) 0px -338px no-repeat; width:16px; height:27px; display:block;float:right; margin-top:15px;}
+a:hover.ur_icon_de{ background:url(../images/icons.png) -20px -338px no-repeat;}
+.ur_icon_edit{ background:url(../images/icons.png) 0px -272px no-repeat; width:16px; height:27px; display:block;float:right; margin-top:15px; margin-right:10px;}
+a:hover.ur_icon_edit{ background:url(../images/icons.png) -21px -272px  no-repeat;}

From e59e9cd66141e4140515e88a63f7a1b296132374 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 13 Jan 2015 17:03:41 +0800
Subject: [PATCH 018/142] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/new.html.erb         | 236 +++++++++++++++++++++++++++-
 public/stylesheets/images/icons.png | Bin 0 -> 2382 bytes
 2 files changed, 235 insertions(+), 1 deletion(-)
 create mode 100644 public/stylesheets/images/icons.png

diff --git a/app/views/poll/new.html.erb b/app/views/poll/new.html.erb
index 9d07aa0df..85a4ab8e3 100644
--- a/app/views/poll/new.html.erb
+++ b/app/views/poll/new.html.erb
@@ -1 +1,235 @@
-111
\ No newline at end of file
+<!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' %>
+</head>
+
+<body>
+<div class=" polls_content polls_edit" id="polls">
+
+<div class="tabs">
+  <ul class="tabs_list">
+    <li class="tab_item02 "  >
+      <a  title="单选题" class="tab_icon icon_radio">单选题</a>
+    </li>
+    <li class="tab_item02 " >
+      <a  title="多选题" class=" tab_icon icon_checkbox">多选题</a>
+    </li>
+    <li class="tab_item02 " >
+      <a  title="单行文字" class="tab_icon icon_text">单行文字</a>
+    </li>
+    <li class="tab_item02 " >
+      <a  title="多行文字" class="tab_icon icon_textarea">多行文字</a>
+    </li>
+  </ul>
+  <div class="cl"></div>
+</div><!--选项 end-->
+
+<div class="ur_editor ur_title_editor"> <!--编辑头部start-->
+  <div class="ur_title_editor_title">
+    <input type="text" name="title" class="input_title" value="问卷标题">
+  </div>
+  <div class="ur_title_editor_prefix">
+    <textarea name="prefix"  class="textarea_editor">问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述</textarea>
+  </div>
+  <div class="ur_editor_footer">
+    <a class="btn_submit" data-button="ok">确定</a>
+    <a class="btn_cancel" data-button="cancel">取消</a>
+  </div>
+  <div class="cl"></div>
+</div><!--编辑头部 end-->
+
+<div><!--编辑单选start-->
+  <div class="ur_editor radio">
+    <div class="ur_editor_title">
+      <label >问题：&nbsp;&nbsp;</label>
+      <input class="ur_question_title" type="text" name="title" placeholder="请输入问题标题" value="单选题">
+      <input type="checkbox" name="required" value="true" checked="">
+      <label >必答</label>
+    </div>
+    <div class="ur_editor_content">
+      <ul>
+        <li class="ur_item">
+          <label   >选项 <span class="ur_index">01</span>： </label>
+          <input  type="text" name="option" value="新建选项">
+          <a class="icon_add" title="向下插入选项"></a>
+          <a class="icon_remove"  title="删除"></a>
+        </li>
+        <div class="cl"></div>
+        <li class="ur_item">
+          <label  >选项 <span class="ur_index">01</span>： </label>
+          <input  type="text" name="option" value="新建选项">
+          <a class="icon_add" title="向下插入选项"></a>
+          <a class="icon_remove"  title="删除"></a>
+        </li>
+        <div class="cl"></div>
+      </ul>
+    </div>
+    <div class="ur_editor_footer">
+      <a class="btn btn_dark btn_submit" data-button="ok">确定</a>
+      <a class="btn btn_light btn_cancel" data-button="cancel">取消</a>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div><!--编辑单选 end-->
+<div class="ur_question_item radio ur_editor02">
+  <div class="ur_title">
+    <span class="title_index">第1题：</span> 单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题  <span class="ur_required" title="必答">*</span>
+  </div>
+  <a href="#" class="ur_icon_de" title="删除"></a>
+  <a href="#" class="ur_icon_edit" title="编辑"></a>
+  <div class="cl"></div>
+  <div class="ur_inputs">
+    <table class="ur_table" >
+      <tbody>
+      <tr>
+        <td>
+          <label ><input class="ur_radio" type="radio" value="新建选项" > 新建选项</label>
+        </td>
+      </tr>
+      <tr >
+        <td>
+          <label ><input class="ur_radio" type="radio" value="新建选项" > 新建选项</label>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <label ><input class="ur_radio" type="radio" value="新建选项" > 新建选项</label>
+        </td>
+      </tr>
+      </tbody>
+    </table>
+  </div>
+</div><!--单选题显示 end-->
+
+<div><!--编辑多选start-->
+  <div class="ur_editor checkbox">
+    <div class="ur_editor_title">
+      <label >问题：&nbsp;&nbsp;</label>
+      <input class="ur_question_title" type="text" name="title" placeholder="请输入问题标题" value="单选题">
+      <input type="checkbox" name="required" value="true" checked="">
+      <label >必答</label>
+    </div>
+    <div class="ur_editor_content">
+      <ul>
+        <li class="ur_item">
+          <label   >选项 <span class="ur_index">01</span>： </label>
+          <input  type="text" name="option" value="新建选项">
+          <a class="icon_add" title="向下插入选项"></a>
+          <a class="icon_remove"  title="删除"></a>
+        </li>
+        <div class="cl"></div>
+        <li class="ur_item">
+          <label  >选项 <span class="ur_index">01</span>： </label>
+          <input  type="text" name="option" value="新建选项">
+          <a class="icon_add" title="向下插入选项"></a>
+          <a class="icon_remove"  title="删除"></a>
+        </li>
+        <div class="cl"></div>
+      </ul>
+    </div>
+    <div class="ur_editor_footer">
+      <a class="btn btn_dark btn_submit" data-button="ok">确定</a>
+      <a class="btn btn_light btn_cancel" data-button="cancel">取消</a>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div><!--编辑多选 end-->
+<div  class="ur_question_item checkbox ur_editor02">
+  <div class="ur_title">
+    <span class="title_index">第2题：</span> 多选题  <span class="ur_required" title="必答">*</span>
+  </div>
+  <a href="#" class="ur_icon_de" title="删除"></a>
+  <a href="#" class="ur_icon_edit" title="编辑"></a>
+  <div class="cl"></div>
+  <div class="ur_inputs">
+    <table class="ur_table">
+      <tbody>
+      <tr>
+        <td>
+          <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
+        </td>
+      </tr>
+      <tr >
+        <td>
+          <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
+        </td>
+      </tr>
+      </tbody>
+    </table>
+  </div>
+</div><!--多选题显示 end-->
+
+<div class="ur_editor text "> <!--编辑单行文字start-->
+  <div class="ur_editor_title">
+    <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
+    <input id="ur_question_title_1" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入问题标题" value="单行主观">
+    <input type="checkbox" name="required" value="true" id="ur_question_require_2">
+    <label for="ur_question_require">必答</label>
+  </div>
+  <div class="ur_editor_footer">
+    <a class="btn_submit" data-button="ok">确定</a>
+    <a class="btn_cancel" data-button="cancel">取消</a>
+  </div>
+  <div class="cl"></div>
+</div><!--编辑单行文字end-->
+<div  class="ur_question_item text ur_editor02 ">
+  <div class="ur_title">
+    <span class="title_index">第3题：</span> 单行文字
+  </div>
+  <a href="#" class="ur_icon_de" title="删除"></a>
+  <a href="#" class="ur_icon_edit" title="编辑"></a>
+  <div class="cl"></div>
+  <div class="ur_inputs">
+    <input class="ur_text ur_textbox" type="text" size="" maxlength=""value="">
+  </div>
+</div><!--单行文字展示 end-->
+
+
+<div class="ur_editor textarea"> <!--编辑多行文字start-->
+  <div class="ur_editor_title">
+    <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
+    <input id="ur_question_title" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入问题标题" value="多行文字">
+    <input type="checkbox" name="required" value="true" id="ur_question_require">
+    <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">确定</a>
+    <a class="btn_cancel" data-button="cancel">取消</a>
+  </div>
+  <div class="cl"></div>
+</div><!--编辑多行文字end-->
+<div class="ur_question_item textarea ur_editor02">
+  <div class="ur_preview">
+    <div class="ur_title">
+      <span class="title_index">第4题：</span> 多行主观
+    </div>
+    <a href="#" class="ur_icon_de" title="删除"></a>
+    <a href="#" class="ur_icon_edit" title="编辑"></a>
+    <div class="cl"></div>
+    <div class="ur_inputs">
+      <textarea  class="ur_textbox"  rows="5" cols="60"></textarea>
+    </div>
+  </div>
+</div><!--多行展示 end-->
+
+<div class="ur_buttons">
+  <a href="#" class="ur_button_submit" >提交</a>
+</div>
+<div class="cl"></div>
+
+</div><!--编辑end-->
+</body>
+</html>
diff --git a/public/stylesheets/images/icons.png b/public/stylesheets/images/icons.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d2b33fe1a24f741e781b935549f8172180870ad
GIT binary patch
literal 2382
zcmZ`*3pA8l8{VHWqG)o7<eIzWo=YwxMVXYMaKxZwRGKkA88p<OtK1S%E;%Bdn3OSQ
z+&^{b9M{}qhCY{)`&1_4$eGsq|FzCKtADL$ujgIwde(m5XRrP4wQn7BIViDl`$hnO
z1kTC9O~5(;Kxaio1d(P}6;nWBWGAmM05(bgSP*!SvrUjx4RCTh0>C9r0BG?5d|Mar
z6ae8y08IM>V3h@cTu7Q<(*XcPdvOl-CnAStbN!wudMdrPV|YE4Jn|@OBmujK`<;Mu
zxJ@@p<%H{>OElK>Pq;RsM@f0&zU5RV*2|HrZ7<p4I$p=*hh!9<O(KU<1MYexpdSsW
zO*GxsVSi|p>AL#3effFNye*YNm~Wfym_72@`neJHLtBX5s`ccOby$7Sx^S+`hO#yY
z1E_T?$Ke3Dz<Y3pufyog8TY2yflbEbx7BFQ2icuF!!e|qNxJ)F^hDoq<s3EVOA$&r
z4EeA|stD|&tj7_lZTs$xG==r+og*7e)Y^^^%k-6aP_ef<dk!|)GW5E9eAJO6J2~VA
zJ)%Xn{bu(8-Qw$gV}KH}mFDWjr;Qa@J|hOw<V-5ccGdk3&3{cZF}`()dH&7Gmo&Qx
z`@Hh-Na9g<=;P+)J;gOau`rg9yTd4R%P&Qcfl$!gmunKC-sw+X4D9kSyQ>)bSkUt|
z+;RNG=zjN(rV`4K6(K$_<WRD8@Tf;g@|b8SRx@F;q#Aeg(3a~vva5REPB;Sev45kC
z0O$8iB{GfX`IqeP)9x&~E;{a$k002M2+gecYZm26lRBcXb`lt^sI%(tnNkA&qs*_g
zg?bKelS%f`&B0hMK;Q5u_xNzP9p)tDK5X8W=xmCe=ta7lk?6juLMP>%op0Su`}#_%
z^>m}{bXGNlbZ9@talLX+i$4uE4_-C#vHg`}g6GarG@XRWX#qxW+i0iy;_bo;WF_(c
zcJN<M<nxXWi^27`XIwnH<|wahhAku{ZJjLd>2wHxoKHz#W5lFA5lCCXMQP^4iel{D
z3y&vuvAm_x>2+3+%-;V4ct(~yp|IzUd9G*H1?EXyu^JTmN1pM4>R$jfja%IjWx)z)
z<{scTGDq#-nL0kQY%)EioPtaBiJ+DDX#Cu#!2CG0vuIz@3Cr-kMZGRXCk)DV7Ev<9
z*jf!<m^I9@7%#tnCBbd_0K$RSD%Ygp{U>KOeSL5vwhTH;kM9N<ZVMupF}02TS5%e_
z--!55;=gR<DItEa=Y`>|{tf*r7I#GwD_?$piKMt;10G&6dH+Cx))^JvAe5(Db2}Ku
z(2hnD^U%J}U$aou+Aq#9MCUh|fB|#qxvbTcu=zmbdH+hGoQ#S{o^a*h)3CtCZ_3dO
zB~Qu4gBATpwH@Z|5w@vTPywuK+HNxquNjDSTw2vtIMJ0AU9k((FD=FUBL6IAGrL_`
z#r2SquKIAIX`j0ZqxVrnX}Z;PVJ7Ab`)hp1Cs#VZxJ5bMuL7lvY%c2ko<22~-&2<v
zYnXwR3#R*tBwI~hK4Txv-Vcwv^ewd{Aivt2ZH=0YR1jP{ew_3R7PPSRZ18dVPyzEY
zeb(kJ$_hRAmm>RU@Y;D@d};d7RFZl?i0GIvPl~5c-7lH(3jW^REI8RtSQaruG|0z-
z=`<E(cX7xL;+8VM3-R);3B=EN(PFR2b6q6X0*S@(9=7sUspQNVJ+AL3u`nzAyU}Nc
z43i1j<)lNV=v$@J!v7d3XRqDuyXX^Mg(+Oj*X*Q2wrtZf&!BrA6nFGClQ&SqOz*po
z^jMV*mDZgqA{`yO=;@RJ1@6VqM}hPm+G=|<UmL1fm-v)A*R3YSyK|ZG>Cj;J>#hC{
zLX|UTScy*X8e#nOV89kZLL}`(zoZ!Z-31>V>x3H`h>RtzMFZJBvu?2XpJHr@uwsU~
zsk7cG`6)t=Gi+uZgBCAwuhK*=Gb9(YlkyK^Hsj#J)^mN%usK~E2h09$s4hkJlAN8i
zzj=p7OmoSg3A(NnNJBOJwK2*1&{B4iXY2G>yFP?cmoiG#`9b7{!N{kx1|n?Eh@wwh
z<Uu@Yb2?gX1AB_}%~449AM;dO55>D^FIi1d^3i|ESX$hAw-CZS8El?pJlXsS!6GuK
zKz=4A#>9Y|+U`*j9_9+OK*$-q)MafR-+0u#;{I0Nepn^8!MGIu9wyE{Y|a4nt(DXo
zyy3di@@}$tWTC1LAzJ|&fpQ4=!`09-J%$@B_bF;rinu*s-mKZDW#h7I&CM%%yg;N5
zj)6OEB(yO;q-?&hHv<-$S=9o5Xl(0qsq75~U5|~mx(JGhEo?{|pz@Cnt*DW&5m#tO
zkk`i7^O$!iRlw)zk$|@MrN@U)DL8UYkG!vsBmZV@5f=spi_6e0nrfY!5UN(xsGFd+
z$zUQ-f$E{?o;?v<t&dma+L~?&T;C`5%g=Vk<TbKLSdm%({7oHlQyw#Q4%uGSeH+AS
z4MH{BW+Ros_r}Oo)fWPN6|p}y0))Y&?9tW42At_>hN$9A?9blN9%z<Q6I4AsKZUD1
zR?=tHbDkN>DJjmW347VWKHi)Ue3NMQ#XWnD`-6v5{7cld0_IKIfVMo`C33gQL6?e5
zorWXG<U&m6b<mu(H_ic+X~7j$%T;0x9y_RN1)K80#{Z$EdU<zzr~7cv48KFWlt%##
zA_kiD8@YX)2Z9~HT{RE>n%4j7*#?%-0_vW=lOngA$S`}A?aK(VA45zyCC1B^BhD}#
zTZoD%Au<e6NUE(|cWmngL(x~MBo<XV{vGb7LGA6v8&sbF25!G<v-AB~O^MjIW;k&T
zN5oC_&rKHPXFsdzZp;KYUp9NUG>K;uBG2*F*HraA&8r&^8Y{4lUy_<@a*WvNFV4k_
zW5pEZ@f|36l*MU7y)$p7E>bicgT<Gxj~k1Sh;2o=&R>vQ8h~muGr^RWA6fhn=d}7J
zHL_m#9sZn*`lj~i9XDAo`0H5h_+CQ!(mDk6uNQX3y-ao&{DlC{(Z%7}KL5DC0Rml0
AWB>pF

literal 0
HcmV?d00001


From 0a9509a9211433c66e8f4b2401c224d3f5f33365 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 13 Jan 2015 17:54:19 +0800
Subject: [PATCH 019/142] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/new.html.erb                   |  2 +-
 public/stylesheets/polls.css                  | 34 +++++++++----------
 .../stylesheets/application.css               |  4 +--
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/app/views/poll/new.html.erb b/app/views/poll/new.html.erb
index 85a4ab8e3..b182f4a29 100644
--- a/app/views/poll/new.html.erb
+++ b/app/views/poll/new.html.erb
@@ -9,7 +9,7 @@
 <body>
 <div class=" polls_content polls_edit" id="polls">
 
-<div class="tabs">
+<div class="tabs_1">
   <ul class="tabs_list">
     <li class="tab_item02 "  >
       <a  title="单选题" class="tab_icon icon_radio">单选题</a>
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 99e88c98d..fe8af280f 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -1,5 +1,5 @@
 /* CSS Document */
-#polls{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+#polls{ font-size:12px; font-family:"微软雅黑","宋体" !important; 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{ margin:0; padding:0;}
 #polls div,img,tr,td{ border:0;}
 #polls table,tr,td{border:0; cellspacing:0; cellpadding:0;}
@@ -69,22 +69,22 @@ a:hover.ur_button{ background:#0fa9bb; text-decoration:none;}
 /*问卷编辑*/
 .polls_edit{ color:#767676;}
 a:hover{ text-decoration:none; cursor:pointer;}
-.tabs{ width:665px; height: auto; border:1px solid #cbcbcb; padding:10px 0 0 10px; margin-bottom:10px;}
+.tabs_1{ width:665px; height: auto; border:1px solid #cbcbcb; padding:10px 0 0 10px; margin-bottom:10px;}
 .tab_item { float:left; height:30px; background:#eeeeee; margin-right:4px; padding:0 8px; margin-bottom:10px;}
 .icon_delete{ font-size:16px;}
 a:hover.icon_delete{ font-weight: bold;}
 .current{ color:#4f4f4d; background:#c4c4c4;}
 .tab_add{float:left;  width:22px; height:22px; border:1px solid #cbcbcb; margin-top:6px; }
-.icon_page_add{ background:url(../images/icons.png) 4px -314px no-repeat; width:22px; height:27px; display:block;}
-a:hover.icon_page_add{ background:url(../images/icons.png) -16px -314px no-repeat;}
+.icon_page_add{ background:url(images/icons.png) 4px -314px no-repeat; width:22px; height:27px; display:block;}
+a:hover.icon_page_add{ background:url(images/icons.png) -16px -314px no-repeat;}
 .tab_item02{ float:left; width:141px; height:30px;background:#eeeeee; margin-right:10px; padding:0 10px; margin-bottom:10px; padding:10px 0 0 15px;}
 .tab_item02:hover{ background:#c9c9c9;}
 .tab_icon{padding-left:25px;}
 a:hover.tab_item02{ background:#fff;}
-.icon_radio{background:url(../images/icons.png) 0px 0px no-repeat; }
-.icon_checkbox{background:url(../images/icons.png) 0px -40px no-repeat; }
-.icon_text{background:url(../images/icons.png) 0px -80px no-repeat; }
-.icon_textarea{background:url(../images/icons.png) 0px -120px no-repeat; }
+.icon_radio{background:url(images/icons.png) 0px 0px no-repeat;color: gray; padding-bottom: 5px;}
+.icon_checkbox{background:url(images/icons.png) 0px -40px no-repeat;color: gray; padding-bottom: 5px;}
+.icon_text{background:url(images/icons.png) 0px -80px no-repeat;color: gray; padding-bottom: 5px;}
+.icon_textarea{background:url(images/icons.png) 0px -120px no-repeat; color: gray;padding-bottom: 5px;}
 
 .ur_editor {width:655px; border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px;}
 .ur_title_editor_title{ margin-bottom:10px;}
@@ -98,18 +98,18 @@ a:hover.btn_cancel{ color:#666;}
 .ur_editor_title{ margin-bottom:10px;}
 .ur_editor_content{ }
 .ur_item{ margin-bottom:5px; height:32px; }
-.ur_item input{ width:324px; height:30px;border:1px solid #cbcbcb; padding-left:5px; float:left; margin-right:10px; }
+.ur_item input{ width:324px; height:30px;border:1px solid #cbcbcb; padding:0 5px; float:left; margin-right:10px; }
 .ur_item label{ float:left;}
-.icon_add{ background:url(../images/icons.png) 0px -310px no-repeat; width:16px; height:27px; display:block;float:left; margin-right:5px;}
-a:hover.icon_add{background:url(../images/icons.png) -20px -310px no-repeat;}
-.icon_remove{background:url(../images/icons.png) 0px -338px no-repeat; width:16px; height:27px; display:block;float:left;}
-a:hover.icon_remove{background:url(../images/icons.png) -20px -338px no-repeat;}
+.icon_add{ background:url(images/icons.png) 0px -310px no-repeat; width:16px; height:27px; display:block;float:left; margin-right:5px;}
+a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;}
+.icon_remove{background:url(images/icons.png) 0px -338px no-repeat; width:16px; height:27px; display:block;float:left;}
+a:hover.icon_remove{background:url(images/icons.png) -20px -338px no-repeat;}
 .ur_editor_toolbar{ margin-bottom:10px;}
 .ur_editor_toolbar input{ width:40px; height:20px;}
 .ur_editor02{width:655px; border:1px solid #cbcbcb; padding:10px; margin-bottom:10px;}
 a.ur_button_submit{ display:block; width:106px; height:37px; margin:0 auto; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:3px; margin-bottom:10px; }
 a:hover.ur_button_submit{ background:#0fa9bb; text-decoration:none;}
-a.ur_icon_de{ background:url(../images/icons.png) 0px -338px no-repeat; width:16px; height:27px; display:block;float:right; margin-top:15px;}
-a:hover.ur_icon_de{ background:url(../images/icons.png) -20px -338px no-repeat;}
-.ur_icon_edit{ background:url(../images/icons.png) 0px -272px no-repeat; width:16px; height:27px; display:block;float:right; margin-top:15px; margin-right:10px;}
-a:hover.ur_icon_edit{ background:url(../images/icons.png) -21px -272px  no-repeat;}
+a.ur_icon_de{ background:url(images/icons.png) 0px -338px no-repeat; width:16px; height:27px; display:block;float:right; margin-top:15px;}
+a:hover.ur_icon_de{ background:url(images/icons.png) -20px -338px no-repeat;}
+.ur_icon_edit{ background:url(images/icons.png) 0px -272px no-repeat; width:16px; height:27px; display:block;float:right; margin-top:15px; margin-right:10px;}
+a:hover.ur_icon_edit{ background:url(images/icons.png) -21px -272px  no-repeat;}
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index e10c5a91b..897434393 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -851,8 +851,8 @@ p.breadcrumb
 
 input[type="text"],input[type="password"],textarea,select
 {
-  padding:2px;
-  border:1px solid #039ea0 
+  #padding:2px;
+  #border:1px solid #039ea0
 }
 
 input[type="text"],input[type="password"]

From ac7c0081d5189fb4d987af8b542aafda46b5ae66 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 13 Jan 2015 18:06:02 +0800
Subject: [PATCH 020/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E9=A2=98=E6=A0=87=E9=A2=98input=E8=BF=87=E5=AE=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/polls.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index fe8af280f..428ade808 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -94,7 +94,7 @@ a:hover.tab_item02{ background:#fff;}
 a:hover.btn_submit{background:#0fa9bb;}
 .btn_cancel{width:54px; height:22px;  padding-top:4px;background:#fff; color:#999; border:1px solid #999; text-align:center; display:block; float:left; }
 a:hover.btn_cancel{ color:#666;}
-.ur_question_title{ width:534px; height:30px; border:1px solid #cbcbcb; padding-left:5px; margin-right:10px;}
+.ur_question_title{ width:534px; height:30px; border:1px solid #cbcbcb; padding:0 5px !important; margin-right:10px;}
 .ur_editor_title{ margin-bottom:10px;}
 .ur_editor_content{ }
 .ur_item{ margin-bottom:5px; height:32px; }

From c84b8f75cc85960f9e72fcb744d8a723d7547fc6 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 13 Jan 2015 18:21:46 +0800
Subject: [PATCH 021/142] =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E7=9A=84=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=88=86=E5=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_edit_MC.html.erb     |  33 +++++
 app/views/poll/_edit_MCQ.html.erb    |  33 +++++
 app/views/poll/_edit_mulit.html.erb  |  18 +++
 app/views/poll/_edit_single.html.erb |  13 ++
 app/views/poll/_show_MC.html.erb     |  29 +++++
 app/views/poll/_show_MCQ.html.erb    |  29 +++++
 app/views/poll/_show_mulit.html.erb  |  13 ++
 app/views/poll/_show_single.html.erb |  11 ++
 app/views/poll/new.html.erb          | 184 ---------------------------
 9 files changed, 179 insertions(+), 184 deletions(-)
 create mode 100644 app/views/poll/_edit_MC.html.erb
 create mode 100644 app/views/poll/_edit_MCQ.html.erb
 create mode 100644 app/views/poll/_edit_mulit.html.erb
 create mode 100644 app/views/poll/_edit_single.html.erb
 create mode 100644 app/views/poll/_show_MC.html.erb
 create mode 100644 app/views/poll/_show_MCQ.html.erb
 create mode 100644 app/views/poll/_show_mulit.html.erb
 create mode 100644 app/views/poll/_show_single.html.erb

diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
new file mode 100644
index 000000000..fb94bc7c8
--- /dev/null
+++ b/app/views/poll/_edit_MC.html.erb
@@ -0,0 +1,33 @@
+<div><!--编辑单选start-->
+  <div class="ur_editor radio">
+    <div class="ur_editor_title">
+      <label >问题：&nbsp;&nbsp;</label>
+      <input class="ur_question_title" type="text" name="title" placeholder="请输入问题标题" value="单选题">
+      <input type="checkbox" name="required" value="true" checked="">
+      <label >必答</label>
+    </div>
+    <div class="ur_editor_content">
+      <ul>
+        <li class="ur_item">
+          <label   >选项 <span class="ur_index">01</span>： </label>
+          <input  type="text" name="option" value="新建选项">
+          <a class="icon_add" title="向下插入选项"></a>
+          <a class="icon_remove"  title="删除"></a>
+        </li>
+        <div class="cl"></div>
+        <li class="ur_item">
+          <label  >选项 <span class="ur_index">01</span>： </label>
+          <input  type="text" name="option" value="新建选项">
+          <a class="icon_add" title="向下插入选项"></a>
+          <a class="icon_remove"  title="删除"></a>
+        </li>
+        <div class="cl"></div>
+      </ul>
+    </div>
+    <div class="ur_editor_footer">
+      <a class="btn btn_dark btn_submit" data-button="ok">确定</a>
+      <a class="btn btn_light btn_cancel" data-button="cancel">取消</a>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div><!--编辑单选 end-->
\ No newline at end of file
diff --git a/app/views/poll/_edit_MCQ.html.erb b/app/views/poll/_edit_MCQ.html.erb
new file mode 100644
index 000000000..1d221c144
--- /dev/null
+++ b/app/views/poll/_edit_MCQ.html.erb
@@ -0,0 +1,33 @@
+<div><!--编辑多选start-->
+  <div class="ur_editor checkbox">
+    <div class="ur_editor_title">
+      <label >问题：&nbsp;&nbsp;</label>
+      <input class="ur_question_title" type="text" name="title" placeholder="请输入问题标题" value="单选题">
+      <input type="checkbox" name="required" value="true" checked="">
+      <label >必答</label>
+    </div>
+    <div class="ur_editor_content">
+      <ul>
+        <li class="ur_item">
+          <label   >选项 <span class="ur_index">01</span>： </label>
+          <input  type="text" name="option" value="新建选项">
+          <a class="icon_add" title="向下插入选项"></a>
+          <a class="icon_remove"  title="删除"></a>
+        </li>
+        <div class="cl"></div>
+        <li class="ur_item">
+          <label  >选项 <span class="ur_index">01</span>： </label>
+          <input  type="text" name="option" value="新建选项">
+          <a class="icon_add" title="向下插入选项"></a>
+          <a class="icon_remove"  title="删除"></a>
+        </li>
+        <div class="cl"></div>
+      </ul>
+    </div>
+    <div class="ur_editor_footer">
+      <a class="btn btn_dark btn_submit" data-button="ok">确定</a>
+      <a class="btn btn_light btn_cancel" data-button="cancel">取消</a>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div><!--编辑多选 end-->
\ No newline at end of file
diff --git a/app/views/poll/_edit_mulit.html.erb b/app/views/poll/_edit_mulit.html.erb
new file mode 100644
index 000000000..bab897489
--- /dev/null
+++ b/app/views/poll/_edit_mulit.html.erb
@@ -0,0 +1,18 @@
+<div class="ur_editor textarea"> <!--编辑多行文字start-->
+  <div class="ur_editor_title">
+    <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
+    <input id="ur_question_title" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入问题标题" value="多行文字">
+    <input type="checkbox" name="required" value="true" id="ur_question_require">
+    <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">确定</a>
+    <a class="btn_cancel" data-button="cancel">取消</a>
+  </div>
+  <div class="cl"></div>
+</div><!--编辑多行文字end-->
\ No newline at end of file
diff --git a/app/views/poll/_edit_single.html.erb b/app/views/poll/_edit_single.html.erb
new file mode 100644
index 000000000..73f22c2cd
--- /dev/null
+++ b/app/views/poll/_edit_single.html.erb
@@ -0,0 +1,13 @@
+<div class="ur_editor text "> <!--编辑单行文字start-->
+  <div class="ur_editor_title">
+    <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
+    <input id="ur_question_title_1" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入问题标题" value="单行主观">
+    <input type="checkbox" name="required" value="true" id="ur_question_require_2">
+    <label for="ur_question_require">必答</label>
+  </div>
+  <div class="ur_editor_footer">
+    <a class="btn_submit" data-button="ok">确定</a>
+    <a class="btn_cancel" data-button="cancel">取消</a>
+  </div>
+  <div class="cl"></div>
+</div><!--编辑单行文字end-->
\ No newline at end of file
diff --git a/app/views/poll/_show_MC.html.erb b/app/views/poll/_show_MC.html.erb
new file mode 100644
index 000000000..c647582ca
--- /dev/null
+++ b/app/views/poll/_show_MC.html.erb
@@ -0,0 +1,29 @@
+<div class="ur_question_item radio ur_editor02">
+  <div class="ur_title">
+    <span class="title_index">第1题：</span> 单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题  <span class="ur_required" title="必答">*</span>
+  </div>
+  <a href="#" class="ur_icon_de" title="删除"></a>
+  <a href="#" class="ur_icon_edit" title="编辑"></a>
+  <div class="cl"></div>
+  <div class="ur_inputs">
+    <table class="ur_table" >
+      <tbody>
+      <tr>
+        <td>
+          <label ><input class="ur_radio" type="radio" value="新建选项" > 新建选项</label>
+        </td>
+      </tr>
+      <tr >
+        <td>
+          <label ><input class="ur_radio" type="radio" value="新建选项" > 新建选项</label>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <label ><input class="ur_radio" type="radio" value="新建选项" > 新建选项</label>
+        </td>
+      </tr>
+      </tbody>
+    </table>
+  </div>
+</div><!--单选题显示 end-->
\ No newline at end of file
diff --git a/app/views/poll/_show_MCQ.html.erb b/app/views/poll/_show_MCQ.html.erb
new file mode 100644
index 000000000..e56de53b9
--- /dev/null
+++ b/app/views/poll/_show_MCQ.html.erb
@@ -0,0 +1,29 @@
+<div  class="ur_question_item checkbox ur_editor02">
+  <div class="ur_title">
+    <span class="title_index">第2题：</span> 多选题  <span class="ur_required" title="必答">*</span>
+  </div>
+  <a href="#" class="ur_icon_de" title="删除"></a>
+  <a href="#" class="ur_icon_edit" title="编辑"></a>
+  <div class="cl"></div>
+  <div class="ur_inputs">
+    <table class="ur_table">
+      <tbody>
+      <tr>
+        <td>
+          <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
+        </td>
+      </tr>
+      <tr >
+        <td>
+          <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
+        </td>
+      </tr>
+      </tbody>
+    </table>
+  </div>
+</div><!--多选题显示 end-->
\ No newline at end of file
diff --git a/app/views/poll/_show_mulit.html.erb b/app/views/poll/_show_mulit.html.erb
new file mode 100644
index 000000000..35e37ef06
--- /dev/null
+++ b/app/views/poll/_show_mulit.html.erb
@@ -0,0 +1,13 @@
+<div class="ur_question_item textarea ur_editor02">
+  <div class="ur_preview">
+    <div class="ur_title">
+      <span class="title_index">第4题：</span> 多行主观
+    </div>
+    <a href="#" class="ur_icon_de" title="删除"></a>
+    <a href="#" class="ur_icon_edit" title="编辑"></a>
+    <div class="cl"></div>
+    <div class="ur_inputs">
+      <textarea  class="ur_textbox"  rows="5" cols="60"></textarea>
+    </div>
+  </div>
+</div><!--多行展示 end-->
\ No newline at end of file
diff --git a/app/views/poll/_show_single.html.erb b/app/views/poll/_show_single.html.erb
new file mode 100644
index 000000000..437e38044
--- /dev/null
+++ b/app/views/poll/_show_single.html.erb
@@ -0,0 +1,11 @@
+<div  class="ur_question_item text ur_editor02 ">
+  <div class="ur_title">
+    <span class="title_index">第3题：</span> 单行文字
+  </div>
+  <a href="#" class="ur_icon_de" title="删除"></a>
+  <a href="#" class="ur_icon_edit" title="编辑"></a>
+  <div class="cl"></div>
+  <div class="ur_inputs">
+    <input class="ur_text ur_textbox" type="text" size="" maxlength=""value="">
+  </div>
+</div><!--单行文字展示 end-->
\ No newline at end of file
diff --git a/app/views/poll/new.html.erb b/app/views/poll/new.html.erb
index b182f4a29..8f3cde9da 100644
--- a/app/views/poll/new.html.erb
+++ b/app/views/poll/new.html.erb
@@ -41,190 +41,6 @@
   <div class="cl"></div>
 </div><!--编辑头部 end-->
 
-<div><!--编辑单选start-->
-  <div class="ur_editor radio">
-    <div class="ur_editor_title">
-      <label >问题：&nbsp;&nbsp;</label>
-      <input class="ur_question_title" type="text" name="title" placeholder="请输入问题标题" value="单选题">
-      <input type="checkbox" name="required" value="true" checked="">
-      <label >必答</label>
-    </div>
-    <div class="ur_editor_content">
-      <ul>
-        <li class="ur_item">
-          <label   >选项 <span class="ur_index">01</span>： </label>
-          <input  type="text" name="option" value="新建选项">
-          <a class="icon_add" title="向下插入选项"></a>
-          <a class="icon_remove"  title="删除"></a>
-        </li>
-        <div class="cl"></div>
-        <li class="ur_item">
-          <label  >选项 <span class="ur_index">01</span>： </label>
-          <input  type="text" name="option" value="新建选项">
-          <a class="icon_add" title="向下插入选项"></a>
-          <a class="icon_remove"  title="删除"></a>
-        </li>
-        <div class="cl"></div>
-      </ul>
-    </div>
-    <div class="ur_editor_footer">
-      <a class="btn btn_dark btn_submit" data-button="ok">确定</a>
-      <a class="btn btn_light btn_cancel" data-button="cancel">取消</a>
-    </div>
-    <div class="cl"></div>
-  </div>
-</div><!--编辑单选 end-->
-<div class="ur_question_item radio ur_editor02">
-  <div class="ur_title">
-    <span class="title_index">第1题：</span> 单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题  <span class="ur_required" title="必答">*</span>
-  </div>
-  <a href="#" class="ur_icon_de" title="删除"></a>
-  <a href="#" class="ur_icon_edit" title="编辑"></a>
-  <div class="cl"></div>
-  <div class="ur_inputs">
-    <table class="ur_table" >
-      <tbody>
-      <tr>
-        <td>
-          <label ><input class="ur_radio" type="radio" value="新建选项" > 新建选项</label>
-        </td>
-      </tr>
-      <tr >
-        <td>
-          <label ><input class="ur_radio" type="radio" value="新建选项" > 新建选项</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <label ><input class="ur_radio" type="radio" value="新建选项" > 新建选项</label>
-        </td>
-      </tr>
-      </tbody>
-    </table>
-  </div>
-</div><!--单选题显示 end-->
-
-<div><!--编辑多选start-->
-  <div class="ur_editor checkbox">
-    <div class="ur_editor_title">
-      <label >问题：&nbsp;&nbsp;</label>
-      <input class="ur_question_title" type="text" name="title" placeholder="请输入问题标题" value="单选题">
-      <input type="checkbox" name="required" value="true" checked="">
-      <label >必答</label>
-    </div>
-    <div class="ur_editor_content">
-      <ul>
-        <li class="ur_item">
-          <label   >选项 <span class="ur_index">01</span>： </label>
-          <input  type="text" name="option" value="新建选项">
-          <a class="icon_add" title="向下插入选项"></a>
-          <a class="icon_remove"  title="删除"></a>
-        </li>
-        <div class="cl"></div>
-        <li class="ur_item">
-          <label  >选项 <span class="ur_index">01</span>： </label>
-          <input  type="text" name="option" value="新建选项">
-          <a class="icon_add" title="向下插入选项"></a>
-          <a class="icon_remove"  title="删除"></a>
-        </li>
-        <div class="cl"></div>
-      </ul>
-    </div>
-    <div class="ur_editor_footer">
-      <a class="btn btn_dark btn_submit" data-button="ok">确定</a>
-      <a class="btn btn_light btn_cancel" data-button="cancel">取消</a>
-    </div>
-    <div class="cl"></div>
-  </div>
-</div><!--编辑多选 end-->
-<div  class="ur_question_item checkbox ur_editor02">
-  <div class="ur_title">
-    <span class="title_index">第2题：</span> 多选题  <span class="ur_required" title="必答">*</span>
-  </div>
-  <a href="#" class="ur_icon_de" title="删除"></a>
-  <a href="#" class="ur_icon_edit" title="编辑"></a>
-  <div class="cl"></div>
-  <div class="ur_inputs">
-    <table class="ur_table">
-      <tbody>
-      <tr>
-        <td>
-          <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
-        </td>
-      </tr>
-      <tr >
-        <td>
-          <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
-        </td>
-      </tr>
-      </tbody>
-    </table>
-  </div>
-</div><!--多选题显示 end-->
-
-<div class="ur_editor text "> <!--编辑单行文字start-->
-  <div class="ur_editor_title">
-    <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
-    <input id="ur_question_title_1" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入问题标题" value="单行主观">
-    <input type="checkbox" name="required" value="true" id="ur_question_require_2">
-    <label for="ur_question_require">必答</label>
-  </div>
-  <div class="ur_editor_footer">
-    <a class="btn_submit" data-button="ok">确定</a>
-    <a class="btn_cancel" data-button="cancel">取消</a>
-  </div>
-  <div class="cl"></div>
-</div><!--编辑单行文字end-->
-<div  class="ur_question_item text ur_editor02 ">
-  <div class="ur_title">
-    <span class="title_index">第3题：</span> 单行文字
-  </div>
-  <a href="#" class="ur_icon_de" title="删除"></a>
-  <a href="#" class="ur_icon_edit" title="编辑"></a>
-  <div class="cl"></div>
-  <div class="ur_inputs">
-    <input class="ur_text ur_textbox" type="text" size="" maxlength=""value="">
-  </div>
-</div><!--单行文字展示 end-->
-
-
-<div class="ur_editor textarea"> <!--编辑多行文字start-->
-  <div class="ur_editor_title">
-    <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
-    <input id="ur_question_title" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入问题标题" value="多行文字">
-    <input type="checkbox" name="required" value="true" id="ur_question_require">
-    <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">确定</a>
-    <a class="btn_cancel" data-button="cancel">取消</a>
-  </div>
-  <div class="cl"></div>
-</div><!--编辑多行文字end-->
-<div class="ur_question_item textarea ur_editor02">
-  <div class="ur_preview">
-    <div class="ur_title">
-      <span class="title_index">第4题：</span> 多行主观
-    </div>
-    <a href="#" class="ur_icon_de" title="删除"></a>
-    <a href="#" class="ur_icon_edit" title="编辑"></a>
-    <div class="cl"></div>
-    <div class="ur_inputs">
-      <textarea  class="ur_textbox"  rows="5" cols="60"></textarea>
-    </div>
-  </div>
-</div><!--多行展示 end-->
-
 <div class="ur_buttons">
   <a href="#" class="ur_button_submit" >提交</a>
 </div>

From 2f147dcdddf2437619a86d73802f9b9ba3badc81 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Tue, 13 Jan 2015 18:24:14 +0800
Subject: [PATCH 022/142] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E3=80=8A=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E5=9C=B0=E5=9D=80=E8=87=AA=E5=8A=A8=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E3=80=8B=20Signed-off-by:=20alan=20<54753343?=
 =?UTF-8?q?4@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb | 41 +++++++++++++++++++++++
 app/controllers/issues_controller.rb      |  6 ++--
 app/models/mailer.rb                      |  6 +++-
 3 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 2721c57c7..1e7ccb952 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -248,6 +248,23 @@ class ApplicationController < ActionController::Base
       end
     end
   end
+  def authorize1(ctrl = params[:controller], action = params[:action],login = params[:user_name],pwd = params[:password], global = false)
+    #modify by NWB
+    if(!User.current.logged? && !login.nil?)
+      password_authentication
+    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 authorize_allowed(ctrl = params[:controller], action = params[:action], global = false)
     #modify by NWB
@@ -789,4 +806,28 @@ 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
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index f3c2b199c..3d270da05 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -22,7 +22,9 @@ class IssuesController < ApplicationController
   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]
+  #before_filter :authorize, :except => [:index, :show]
+  before_filter :authorize1, :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]
@@ -107,7 +109,7 @@ class IssuesController < ApplicationController
   end
 
   def show
-    
+
     @journals = @issue.journals.includes(:user, :details).reorder("#{Journal.table_name}.id ASC").all
     @journals.each_with_index {|j,i| j.indice = i+1}
     @journals.reject!(&:private_notes?) unless User.current.allowed_to?(:view_private_notes, @issue.project)
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index a7f850766..9f599916f 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -104,8 +104,12 @@ class Mailer < ActionMailer::Base
     message_id issue
     @author = issue.author
     @issue = issue
-    @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id)
     recipients = issue.recipients
+    if recipients.include? "547533434@qq.com"
+       @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id, :user_name => 'alan', :password => 'alanlong')
+    else
+      @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id)
+    end
     cc = issue.watcher_recipients - recipients
     mail :to => recipients,
       :cc => cc,

From 311d90d56520c4f588183c123be35578da1a2841 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 13 Jan 2015 20:13:50 +0800
Subject: [PATCH 023/142] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E3=80=81=E5=A4=9A=E9=80=89=E3=80=81=E5=8D=95?=
 =?UTF-8?q?=E8=A1=8C=E6=96=87=E6=9C=AC=E3=80=81=E5=A4=9A=E8=A1=8C=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E7=9A=84js=202.=E5=88=86=E5=89=B2=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=A4=B4=203.=E5=A2=9E=E5=8A=A0=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=97=AE=E9=A2=98=E7=9A=84=E8=B7=AF=E7=94=B1=E5=8F=8A?=
 =?UTF-8?q?action?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb |  5 ++++
 app/views/poll/_edit_MCQ.html.erb  |  2 +-
 app/views/poll/_edit_head.html.erb | 13 +++++++++
 app/views/poll/new.html.erb        | 44 ++++++++++++++++++------------
 config/locales/zh.yml              |  5 ++++
 config/routes.rb                   |  1 +
 6 files changed, 51 insertions(+), 19 deletions(-)
 create mode 100644 app/views/poll/_edit_head.html.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index e5b1025a4..9177e044b 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -81,6 +81,11 @@ class PollController < ApplicationController
     end
   end
 
+  #添加单选题
+  def add_mc
+
+  end
+
   private
   def find_poll_and_course
     @poll = Poll.find params[:id]
diff --git a/app/views/poll/_edit_MCQ.html.erb b/app/views/poll/_edit_MCQ.html.erb
index 1d221c144..b97bba776 100644
--- a/app/views/poll/_edit_MCQ.html.erb
+++ b/app/views/poll/_edit_MCQ.html.erb
@@ -2,7 +2,7 @@
   <div class="ur_editor checkbox">
     <div class="ur_editor_title">
       <label >问题：&nbsp;&nbsp;</label>
-      <input class="ur_question_title" type="text" name="title" placeholder="请输入问题标题" value="单选题">
+      <input class="ur_question_title" type="text" name="title" placeholder="请输入问题标题" value="多选题">
       <input type="checkbox" name="required" value="true" checked="">
       <label >必答</label>
     </div>
diff --git a/app/views/poll/_edit_head.html.erb b/app/views/poll/_edit_head.html.erb
new file mode 100644
index 000000000..6c8294e99
--- /dev/null
+++ b/app/views/poll/_edit_head.html.erb
@@ -0,0 +1,13 @@
+<div class="ur_editor ur_title_editor"> <!--编辑头部start-->
+  <div class="ur_title_editor_title">
+    <input type="text" name="title" class="input_title" value="问卷标题">
+  </div>
+  <div class="ur_title_editor_prefix">
+    <textarea name="prefix"  class="textarea_editor">问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述</textarea>
+  </div>
+  <div class="ur_editor_footer">
+    <a class="btn_submit" data-button="ok">确定</a>
+    <a class="btn_cancel" data-button="cancel">取消</a>
+  </div>
+  <div class="cl"></div>
+</div><!--编辑头部 end-->
\ No newline at end of file
diff --git a/app/views/poll/new.html.erb b/app/views/poll/new.html.erb
index 8f3cde9da..06ef2fae8 100644
--- a/app/views/poll/new.html.erb
+++ b/app/views/poll/new.html.erb
@@ -4,6 +4,13 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>问卷调查_问卷编辑</title>
   <%= stylesheet_link_tag  'polls', :media => 'all' %>
+
+  <script type="text/javascript">
+    function add_MC(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_MC') %>");}
+    function add_MCQ(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_MCQ') %>");}
+    function add_single(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_single') %>");}
+    function add_mulit(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_mulit') %>");}
+  </script>
 </head>
 
 <body>
@@ -12,37 +19,38 @@
 <div class="tabs_1">
   <ul class="tabs_list">
     <li class="tab_item02 "  >
-      <a  title="单选题" class="tab_icon icon_radio">单选题</a>
+      <a title="<%=  l(:label_MC) %>" class="tab_icon icon_radio" onclick="add_MC();">
+        <%=  l(:label_MC) %>
+      </a>
     </li>
     <li class="tab_item02 " >
-      <a  title="多选题" class=" tab_icon icon_checkbox">多选题</a>
+      <a title="<%=  l(:label_MCQ) %>" class=" tab_icon icon_checkbox" onclick="add_MCQ();">
+        <%=  l(:label_MCQ) %>
+      </a>
     </li>
     <li class="tab_item02 " >
-      <a  title="单行文字" class="tab_icon icon_text">单行文字</a>
+      <a title="<%= l(:label_single) %>" class="tab_icon icon_text" onclick="add_single();">
+        <%= l(:label_single) %>
+      </a>
     </li>
     <li class="tab_item02 " >
-      <a  title="多行文字" class="tab_icon icon_textarea">多行文字</a>
+      <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 class="ur_editor ur_title_editor"> <!--编辑头部start-->
-  <div class="ur_title_editor_title">
-    <input type="text" name="title" class="input_title" value="问卷标题">
-  </div>
-  <div class="ur_title_editor_prefix">
-    <textarea name="prefix"  class="textarea_editor">问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述</textarea>
-  </div>
-  <div class="ur_editor_footer">
-    <a class="btn_submit" data-button="ok">确定</a>
-    <a class="btn_cancel" data-button="cancel">取消</a>
-  </div>
-  <div class="cl"></div>
-</div><!--编辑头部 end-->
+<%= render :partial => 'edit_head'%>
+
+<div id="poll_content">
+</div>
 
 <div class="ur_buttons">
-  <a href="#" class="ur_button_submit" >提交</a>
+  <a href="#" class="ur_button_submit" >
+    <%= l(:label_memo_create)%>
+  </a>
 </div>
 <div class="cl"></div>
 
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 7c93f8e98..d130cc666 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2245,4 +2245,9 @@ zh:
   label_poll: 问卷调查
   label_new_poll: 新建问卷
   label_statistical_results: 统计结果
+  label_MC: 单选题
+  label_MCQ: 多选题
+  label_single: 单行文字
+  label_mulit: 多行文字
+
 
diff --git a/config/routes.rb b/config/routes.rb
index 617a5ade4..af0b75ae7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -61,6 +61,7 @@ RedmineApp::Application.routes.draw do
   resources :poll do
     member do
       get 'statistics_result'
+      get 'add_mc'
     end
   end
 

From 85542095a64b3e80e0f0b172ce466c227b693491 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 13 Jan 2015 20:20:28 +0800
Subject: [PATCH 024/142] =?UTF-8?q?=E5=A2=9E=E5=8A=A0input=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=97=B6=E7=9A=84=E6=8F=90=E7=A4=BA=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=83=A8=E5=88=86html=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_edit_MC.html.erb     | 8 ++++----
 app/views/poll/_edit_MCQ.html.erb    | 8 ++++----
 app/views/poll/_edit_mulit.html.erb  | 4 ++--
 app/views/poll/_edit_single.html.erb | 4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index fb94bc7c8..823247a6e 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -2,22 +2,22 @@
   <div class="ur_editor radio">
     <div class="ur_editor_title">
       <label >问题：&nbsp;&nbsp;</label>
-      <input class="ur_question_title" type="text" name="title" placeholder="请输入问题标题" value="单选题">
-      <input type="checkbox" name="required" value="true" checked="">
+      <input class="ur_question_title" type="text" name="title" placeholder="请输入问题标题"/>
+      <input type="checkbox" name="required" value="true" checked=""/>
       <label >必答</label>
     </div>
     <div class="ur_editor_content">
       <ul>
         <li class="ur_item">
           <label   >选项 <span class="ur_index">01</span>： </label>
-          <input  type="text" name="option" value="新建选项">
+          <input  type="text" name="option" placeholder="新建选项"/>
           <a class="icon_add" title="向下插入选项"></a>
           <a class="icon_remove"  title="删除"></a>
         </li>
         <div class="cl"></div>
         <li class="ur_item">
           <label  >选项 <span class="ur_index">01</span>： </label>
-          <input  type="text" name="option" value="新建选项">
+          <input  type="text" name="option" placeholder="新建选项"/>
           <a class="icon_add" title="向下插入选项"></a>
           <a class="icon_remove"  title="删除"></a>
         </li>
diff --git a/app/views/poll/_edit_MCQ.html.erb b/app/views/poll/_edit_MCQ.html.erb
index b97bba776..3a2ad9cec 100644
--- a/app/views/poll/_edit_MCQ.html.erb
+++ b/app/views/poll/_edit_MCQ.html.erb
@@ -2,22 +2,22 @@
   <div class="ur_editor checkbox">
     <div class="ur_editor_title">
       <label >问题：&nbsp;&nbsp;</label>
-      <input class="ur_question_title" type="text" name="title" placeholder="请输入问题标题" value="多选题">
-      <input type="checkbox" name="required" value="true" checked="">
+      <input class="ur_question_title" type="text" name="title" placeholder="请输入问题标题" value="多选题"/>
+      <input type="checkbox" name="required" value="true" checked=""/>
       <label >必答</label>
     </div>
     <div class="ur_editor_content">
       <ul>
         <li class="ur_item">
           <label   >选项 <span class="ur_index">01</span>： </label>
-          <input  type="text" name="option" value="新建选项">
+          <input  type="text" name="option" placeholder="新建选项"/>
           <a class="icon_add" title="向下插入选项"></a>
           <a class="icon_remove"  title="删除"></a>
         </li>
         <div class="cl"></div>
         <li class="ur_item">
           <label  >选项 <span class="ur_index">01</span>： </label>
-          <input  type="text" name="option" value="新建选项">
+          <input  type="text" name="option" placeholder="新建选项"/>
           <a class="icon_add" title="向下插入选项"></a>
           <a class="icon_remove"  title="删除"></a>
         </li>
diff --git a/app/views/poll/_edit_mulit.html.erb b/app/views/poll/_edit_mulit.html.erb
index bab897489..13bf232a7 100644
--- a/app/views/poll/_edit_mulit.html.erb
+++ b/app/views/poll/_edit_mulit.html.erb
@@ -1,8 +1,8 @@
 <div class="ur_editor textarea"> <!--编辑多行文字start-->
   <div class="ur_editor_title">
     <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
-    <input id="ur_question_title" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入问题标题" value="多行文字">
-    <input type="checkbox" name="required" value="true" id="ur_question_require">
+    <input id="ur_question_title" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入问题标题"/>
+    <input type="checkbox" name="required" value="true" id="ur_question_require"/>
     <label for="ur_question_require">必答</label>
   </div>
   <div class="ur_editor_toolbar">
diff --git a/app/views/poll/_edit_single.html.erb b/app/views/poll/_edit_single.html.erb
index 73f22c2cd..764b6bbb3 100644
--- a/app/views/poll/_edit_single.html.erb
+++ b/app/views/poll/_edit_single.html.erb
@@ -1,8 +1,8 @@
 <div class="ur_editor text "> <!--编辑单行文字start-->
   <div class="ur_editor_title">
     <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
-    <input id="ur_question_title_1" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入问题标题" value="单行主观">
-    <input type="checkbox" name="required" value="true" id="ur_question_require_2">
+    <input id="ur_question_title_1" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入问题标题"/>
+    <input type="checkbox" name="required" value="true" id="ur_question_require_2"/>
     <label for="ur_question_require">必答</label>
   </div>
   <div class="ur_editor_footer">

From feb6dc139d8ef9faebbbf83492a7e159b6d406a8 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 13 Jan 2015 20:34:44 +0800
Subject: [PATCH 025/142] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=97=B6js=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_edit_MC.html.erb     |  2 +-
 app/views/poll/_edit_MCQ.html.erb    | 10 +++++-----
 app/views/poll/_edit_head.html.erb   | 12 ++++++++++--
 app/views/poll/_edit_mulit.html.erb  |  4 ++--
 app/views/poll/_edit_single.html.erb |  4 ++--
 app/views/poll/_show_MC.html.erb     | 11 +++++++++--
 6 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index 823247a6e..73d967ca9 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -2,7 +2,7 @@
   <div class="ur_editor radio">
     <div class="ur_editor_title">
       <label >问题：&nbsp;&nbsp;</label>
-      <input class="ur_question_title" type="text" name="title" placeholder="请输入问题标题"/>
+      <input class="ur_question_title" type="text" name="title" placeholder="请输入单选题标题"/>
       <input type="checkbox" name="required" value="true" checked=""/>
       <label >必答</label>
     </div>
diff --git a/app/views/poll/_edit_MCQ.html.erb b/app/views/poll/_edit_MCQ.html.erb
index 3a2ad9cec..cf64e7f3e 100644
--- a/app/views/poll/_edit_MCQ.html.erb
+++ b/app/views/poll/_edit_MCQ.html.erb
@@ -2,22 +2,22 @@
   <div class="ur_editor checkbox">
     <div class="ur_editor_title">
       <label >问题：&nbsp;&nbsp;</label>
-      <input class="ur_question_title" type="text" name="title" placeholder="请输入问题标题" value="多选题"/>
+      <input class="ur_question_title" type="text" name="title" placeholder="请输入多选题题标题"/>
       <input type="checkbox" name="required" value="true" checked=""/>
       <label >必答</label>
     </div>
     <div class="ur_editor_content">
       <ul>
         <li class="ur_item">
-          <label   >选项 <span class="ur_index">01</span>： </label>
-          <input  type="text" name="option" placeholder="新建选项"/>
+          <label>选项 <span class="ur_index">01</span>： </label>
+          <input type="text" name="option" placeholder="新建选项"/>
           <a class="icon_add" title="向下插入选项"></a>
           <a class="icon_remove"  title="删除"></a>
         </li>
         <div class="cl"></div>
         <li class="ur_item">
-          <label  >选项 <span class="ur_index">01</span>： </label>
-          <input  type="text" name="option" placeholder="新建选项"/>
+          <label >选项 <span class="ur_index">01</span>： </label>
+          <input type="text" name="option" placeholder="新建选项"/>
           <a class="icon_add" title="向下插入选项"></a>
           <a class="icon_remove"  title="删除"></a>
         </li>
diff --git a/app/views/poll/_edit_head.html.erb b/app/views/poll/_edit_head.html.erb
index 6c8294e99..759fe58a1 100644
--- a/app/views/poll/_edit_head.html.erb
+++ b/app/views/poll/_edit_head.html.erb
@@ -1,9 +1,17 @@
+<script type="text/javascript">
+  function regexPollsTitle()
+  {
+      var polls_title = $.trim($("#polls_title").val());
+      alert(polls_title);
+  }
+</script>
 <div class="ur_editor ur_title_editor"> <!--编辑头部start-->
   <div class="ur_title_editor_title">
-    <input type="text" name="title" class="input_title" value="问卷标题">
+    <input type="text" name="title" id="polls_title" class="input_title" placeholder="问卷标题" onkeyup="regexPollsTitle();"/>
   </div>
   <div class="ur_title_editor_prefix">
-    <textarea name="prefix"  class="textarea_editor">问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述问卷描述</textarea>
+    <textarea name="prefix"  class="textarea_editor" placeholder="问卷描述">
+    </textarea>
   </div>
   <div class="ur_editor_footer">
     <a class="btn_submit" data-button="ok">确定</a>
diff --git a/app/views/poll/_edit_mulit.html.erb b/app/views/poll/_edit_mulit.html.erb
index 13bf232a7..c4a9e0e0f 100644
--- a/app/views/poll/_edit_mulit.html.erb
+++ b/app/views/poll/_edit_mulit.html.erb
@@ -1,8 +1,8 @@
 <div class="ur_editor textarea"> <!--编辑多行文字start-->
   <div class="ur_editor_title">
     <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
-    <input id="ur_question_title" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入问题标题"/>
-    <input type="checkbox" name="required" value="true" id="ur_question_require"/>
+    <input id="ur_question_title" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入多行文字标题"/>
+    <input type="checkbox" name="required" value="true" id="ur_question_require" checked=""/>
     <label for="ur_question_require">必答</label>
   </div>
   <div class="ur_editor_toolbar">
diff --git a/app/views/poll/_edit_single.html.erb b/app/views/poll/_edit_single.html.erb
index 764b6bbb3..4e98babe4 100644
--- a/app/views/poll/_edit_single.html.erb
+++ b/app/views/poll/_edit_single.html.erb
@@ -1,8 +1,8 @@
 <div class="ur_editor text "> <!--编辑单行文字start-->
   <div class="ur_editor_title">
     <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
-    <input id="ur_question_title_1" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入问题标题"/>
-    <input type="checkbox" name="required" value="true" id="ur_question_require_2"/>
+    <input id="ur_question_title_1" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入单行文字标题"/>
+    <input type="checkbox" name="required" value="true" id="ur_question_require_2" checked=""/>
     <label for="ur_question_require">必答</label>
   </div>
   <div class="ur_editor_footer">
diff --git a/app/views/poll/_show_MC.html.erb b/app/views/poll/_show_MC.html.erb
index c647582ca..b156bc0bc 100644
--- a/app/views/poll/_show_MC.html.erb
+++ b/app/views/poll/_show_MC.html.erb
@@ -1,6 +1,10 @@
 <div class="ur_question_item radio ur_editor02">
   <div class="ur_title">
-    <span class="title_index">第1题：</span> 单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题  <span class="ur_required" title="必答">*</span>
+    <span class="title_index">
+      第<%= question_index%>题：
+    </span>
+    <%= poll_questions.question_title%>
+    <span class="ur_required" title="必答">*</span>
   </div>
   <a href="#" class="ur_icon_de" title="删除"></a>
   <a href="#" class="ur_icon_edit" title="编辑"></a>
@@ -10,7 +14,10 @@
       <tbody>
       <tr>
         <td>
-          <label ><input class="ur_radio" type="radio" value="新建选项" > 新建选项</label>
+          <label >
+            <input class="ur_radio" type="radio" value="新建选项" >
+            新建选项
+          </label>
         </td>
       </tr>
       <tr >

From 60b07432926d330981a15a041fbc959807bf032d Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 14 Jan 2015 09:48:19 +0800
Subject: [PATCH 026/142] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=9C=A8=E7=81=AB=E7=8B=90=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/show.html.erb |  4 ++++
 db/schema.rb                 | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index 66fcd3bcd..a0c111a79 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -25,6 +25,7 @@
         <div class="ur_title">
           <span class="title_index">第1题：</span> 单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题  <span class="ur_required" title="必答">*</span>
         </div>
+        <div class="cl"></div>
         <div class="ur_inputs">
           <table class="ur_table" >
             <tbody>
@@ -52,6 +53,7 @@
         <div class="ur_title">
           <span class="title_index">第2题：</span> 多选题  <span class="ur_required" title="必答">*</span>
         </div>
+        <div class="cl"></div>
         <div class="ur_inputs">
           <table class="ur_table">
             <tbody>
@@ -80,6 +82,7 @@
         <div class="ur_title">
           <span class="title_index">第3题：</span> 单行主观
         </div>
+        <div class="cl"></div>
         <div class="ur_inputs">
           <input class="ur_text ur_textbox" type="text" size="" maxlength=""value="">
         </div>
@@ -90,6 +93,7 @@
           <div class="ur_title">
             <span class="title_index">第4题：</span> 多行主观
           </div>
+          <div class="cl"></div>
           <div class="ur_inputs">
             <textarea  class="ur_textbox"  rows="5" cols="60"></textarea>
           </div>
diff --git a/db/schema.rb b/db/schema.rb
index 9c6f4eac3..a58602e37 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150112024820) do
+ActiveRecord::Schema.define(:version => 20150112080435) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -23,6 +23,18 @@ ActiveRecord::Schema.define(:version => 20150112024820) do
   add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
   add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
 
+  create_table "api_keys", :force => true do |t|
+    t.string   "access_token"
+    t.datetime "expires_at"
+    t.integer  "user_id"
+    t.boolean  "active",       :default => true
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+  end
+
+  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
+  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
+
   create_table "applied_projects", :force => true do |t|
     t.integer "project_id", :null => false
     t.integer "user_id",    :null => false

From e4edc5d1db85c13906772869e6ef34e07832c962 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 14 Jan 2015 10:05:05 +0800
Subject: [PATCH 027/142] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8A=A8=E6=80=81=E5=8A=A0=E8=BD=BD=202.?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=96=E8=BE=91=E5=AE=8C=E6=88=90=E5=90=8E?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=A4=B4=E9=A1=B5=E9=9D=A2=203.=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=97=AE=E5=8D=B7=E6=8C=89=E9=92=AE=E7=9A=84css?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll_form.html.erb | 59 +++++++++++++++++++++++++++++
 app/views/poll/_show_head.html.erb |  8 ++++
 app/views/poll/edit.html.erb       | 13 +------
 app/views/poll/index.html.erb      |  5 +++
 app/views/poll/new.html.erb        | 60 +-----------------------------
 public/stylesheets/polls.css       |  5 +++
 6 files changed, 79 insertions(+), 71 deletions(-)
 create mode 100644 app/views/poll/_poll_form.html.erb
 create mode 100644 app/views/poll/_show_head.html.erb

diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
new file mode 100644
index 000000000..0387bb9c6
--- /dev/null
+++ b/app/views/poll/_poll_form.html.erb
@@ -0,0 +1,59 @@
+<!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' %>
+
+  <script type="text/javascript">
+      function add_MC(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_MC') %>");}
+      function add_MCQ(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_MCQ') %>");}
+      function add_single(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_single') %>");}
+      function add_mulit(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_mulit') %>");}
+  </script>
+</head>
+
+<body>
+<div class=" polls_content polls_edit" id="polls">
+
+  <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-->
+
+  <%= render :partial => 'edit_head'%>
+
+  <div id="poll_content">
+  </div>
+
+  <div class="ur_buttons">
+    <a href="#" class="ur_button_submit" >
+      <%= l(:label_memo_create)%>
+    </a>
+  </div>
+  <div class="cl"></div>
+
+</div><!--编辑end-->
+</body>
+</html>
diff --git a/app/views/poll/_show_head.html.erb b/app/views/poll/_show_head.html.erb
new file mode 100644
index 000000000..f8a2d58f0
--- /dev/null
+++ b/app/views/poll/_show_head.html.erb
@@ -0,0 +1,8 @@
+<div class="ur_page_head ur_editor02" ><!--头部显示 start-->
+  <h1 class="ur_page_title">标题标题标题标题标题标题标题</h1>
+  <p class="ur_prefix_content">描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述
+    描述描述描述描述描述描述描述描述描述描述描述描述
+  </p>
+  <a href="#" class="ur_icon_edit" title="编辑"></a>
+  <div class="cl"></div>
+</div><!--头部显示 end-->
\ No newline at end of file
diff --git a/app/views/poll/edit.html.erb b/app/views/poll/edit.html.erb
index a35b1d2e7..d346d0699 100644
--- a/app/views/poll/edit.html.erb
+++ b/app/views/poll/edit.html.erb
@@ -1,13 +1,2 @@
-<script type="text/javascript">
-  function submit_poll_edit()
-  {
-      $('#edit_poll_<%= @poll.id%>').submit();
-  }
-</script>
-<%= form_for(@poll) do |f|%>
-    <%= f.text_field :polls_name, :required => true, :name => "polls_name"%>
-    <a href="#" class="tijiao" onclick="submit_poll_edit();">
-      <%= l(:label_button_ok)  %>
-    </a>
-<% end%>
+<%= render :partial => 'poll_form'%>
 
diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index 150c13382..9d0bd5549 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -26,6 +26,11 @@
                             method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml20 mr10")  %>
             <% end%>
           </li>
+          <li>
+            <% if @is_teacher%>
+                <%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml20"%>
+            <% end%>
+          </li>
           <li class="polls_date fr">
             <%= format_time poll.created_at%>
           </li>
diff --git a/app/views/poll/new.html.erb b/app/views/poll/new.html.erb
index 06ef2fae8..eddb3a590 100644
--- a/app/views/poll/new.html.erb
+++ b/app/views/poll/new.html.erb
@@ -1,59 +1 @@
-<!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' %>
-
-  <script type="text/javascript">
-    function add_MC(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_MC') %>");}
-    function add_MCQ(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_MCQ') %>");}
-    function add_single(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_single') %>");}
-    function add_mulit(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_mulit') %>");}
-  </script>
-</head>
-
-<body>
-<div class=" polls_content polls_edit" id="polls">
-
-<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-->
-
-<%= render :partial => 'edit_head'%>
-
-<div id="poll_content">
-</div>
-
-<div class="ur_buttons">
-  <a href="#" class="ur_button_submit" >
-    <%= l(:label_memo_create)%>
-  </a>
-</div>
-<div class="cl"></div>
-
-</div><!--编辑end-->
-</body>
-</html>
+<%= render :partial => 'poll_form'%>
\ No newline at end of file
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 428ade808..b13cb1da2 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -13,6 +13,11 @@ div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margi
 #polls .fl{ float: left;}
 #polls .fr{ float:right;}
 
+/*问卷按钮*/
+.polls_btn{ height:33px;border-top:1px solid #15bed1; border-bottom:1px solid #15bed1;border-right:1px solid #cee6e6; width:225px; 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_content{ width:615px;}
 .polls_head{ width:677px; height:48px; background:#eaeaea;}

From b6826a74d34cde40c248aa409ea8c6ca6db7ade9 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Wed, 14 Jan 2015 11:50:59 +0800
Subject: [PATCH 028/142] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb            |   4 +-
 app/models/poll.rb                            |   2 +-
 app/models/poll_question.rb                   |   2 +-
 app/views/poll/show.html.erb                  | 181 ++++++++++--------
 ...0_add_question_number_to_poll_questions.rb |   9 +
 db/schema.rb                                  |   7 +-
 6 files changed, 115 insertions(+), 90 deletions(-)
 create mode 100644 db/migrate/20150114022710_add_question_number_to_poll_questions.rb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 9177e044b..88bbfff46 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -19,8 +19,8 @@ class PollController < ApplicationController
 
   def show
     @poll = Poll.find params[:id]
-    @poll_questions = @poll.poll_questions
-
+    poll_questions = @poll.poll_questions
+    @poll_questions = paginateHelper poll_questions,3 #分页
     respond_to do |format|
       format.html {render :layout => 'base_courses'}
     end
diff --git a/app/models/poll.rb b/app/models/poll.rb
index 803ee6ac6..06f1369c1 100644
--- 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
diff --git a/app/models/poll_question.rb b/app/models/poll_question.rb
index 66dcea67e..2d9912fc2 100644
--- 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
diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index a0c111a79..26daa8fc5 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -20,90 +20,105 @@
 
   <div class="ur_card">
     <ol class="ur_questions">
-
-      <li class="ur_question_item radio">
-        <div class="ur_title">
-          <span class="title_index">第1题：</span> 单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题  <span class="ur_required" title="必答">*</span>
-        </div>
-        <div class="cl"></div>
-        <div class="ur_inputs">
-          <table class="ur_table" >
-            <tbody>
-            <tr>
-              <td>
-                <label ><input class="ur_radio" type="radio" value="新建选项" > 新建选项</label>
-              </td>
-            </tr>
-            <tr >
-              <td>
-                <label ><input class="ur_radio" type="radio" value="新建选项" > 新建选项</label>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <label ><input class="ur_radio" type="radio" value="新建选项" > 新建选项</label>
-              </td>
-            </tr>
-            </tbody>
-          </table>
-        </div>
-      </li><!--单选题 end-->
-
-      <li  class="ur_question_item checkbox">
-        <div class="ur_title">
-          <span class="title_index">第2题：</span> 多选题  <span class="ur_required" title="必答">*</span>
-        </div>
-        <div class="cl"></div>
-        <div class="ur_inputs">
-          <table class="ur_table">
-            <tbody>
-            <tr>
-              <td>
-                <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
-              </td>
-            </tr>
-            <tr class="ur_tr_even">
-              <td>
-                <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
-              </td>
-            </tr>
-            </tbody>
-          </table>
-        </div>
-      </li><!--多选题 end-->
-
-
-      <li  class="ur_question_item text">
-        <div class="ur_title">
-          <span class="title_index">第3题：</span> 单行主观
-        </div>
-        <div class="cl"></div>
-        <div class="ur_inputs">
-          <input class="ur_text ur_textbox" type="text" size="" maxlength=""value="">
-        </div>
-      </li><!--当行输入 end-->
-
-      <li class="ur_question_item textarea">
-        <div class="ur_preview">
-          <div class="ur_title">
-            <span class="title_index">第4题：</span> 多行主观
-          </div>
-          <div class="cl"></div>
-          <div class="ur_inputs">
-            <textarea  class="ur_textbox"  rows="5" cols="60"></textarea>
-          </div>
-        </div>
-      </li><!--多行输入 end-->
-
+      <% @poll_questions.each do |pq| %>
+         <% if pq.question_type == 1 %>
+          <!-- 单选题 -->
+              <li class="ur_question_item radio">
+                <div class="ur_title">
+                  <span class="title_index">第<%= pq.question_number %>题：</span>
+                  <%= pq.question_title %>
+                  <% if pq.is_necessary == 1 %>
+                    <span class="ur_required" title="必答">*</span>
+                  <% end %>
+                </div>
+                <div class="cl"></div>
+                <div class="ur_inputs">
+                  <table class="ur_table" >
+                    <tbody>
+                      <% pq.poll_answers.each do |pa| %>
+                        <tr>
+                          <td>
+                            <label >
+                              <input class="ur_radio" type="radio" value="新建选项" >
+                                <%= pa.answer_text %>
+                            </label>
+                          </td>
+                        </tr>
+                      <% end %>
+                    </tbody>
+                  </table>
+                </div>
+              </li>
+         <% elsif pq.question_type == 2 %>
+          <!-- 多选题 -->
+              <li class="ur_question_item checkbox">
+                <div class="ur_title">
+                  <span class="title_index">第<%= pq.question_number %>题：</span>
+                  <%= pq.question_title %>
+                  <% if pq.is_necessary == 1 %>
+                      <span class="ur_required" title="必答">*</span>
+                  <% end %>
+                </div>
+                <div class="cl"></div>
+                <div class="ur_inputs">
+                  <table class="ur_table" >
+                    <tbody>
+                    <% pq.poll_answers.each do |pa| %>
+                        <tr>
+                          <td>
+                            <label >
+                              <input class="ur_checkbox" type="checkbox" value="新建选项" >
+                              <%= pa.answer_text %>
+                            </label>
+                          </td>
+                        </tr>
+                    <% end %>
+                    </tbody>
+                  </table>
+                </div>
+              </li>
+          <% elsif pq.question_type == 3 %>
+          <!-- 单行文字-->
+              <li  class="ur_question_item text">
+                <div class="ur_title">
+                  <span class="title_index">第<%= pq.question_number %>题：</span>
+                  <%= pq.question_title %>
+                  <% if pq.is_necessary == 1 %>
+                      <span class="ur_required" title="必答">*</span>
+                  <% end %>
+                </div>
+                <div class="cl"></div>
+                <div class="ur_inputs">
+                  <input class="ur_text ur_textbox" type="text" size="" maxlength=""value="">
+                </div>
+              </li><!--当行输入 end-->
+          <% elsif pq.question_type == 4 %>
+          <!-- 多行文字-->
+              <li class="ur_question_item textarea">
+                <div class="ur_preview">
+                  <div class="ur_title">
+                    <span class="title_index">第<%= pq.question_number %>题：</span>
+                    <%= pq.question_title %>
+                    <% if pq.is_necessary == 1 %>
+                        <span class="ur_required" title="必答">*</span>
+                    <% end %>
+                  </div>
+                  <div class="cl"></div>
+                  <div class="ur_inputs">
+                    <textarea  class="ur_textbox"  rows="5" cols="60"></textarea>
+                  </div>
+                </div>
+              </li><!--多行输入 end-->
+          <% else %>
+          <!-- 未知题型 -->
+         <% end %>
+      <% end %>
     </ol>
-
-    <div class="ur_buttons">
-      <a href="#" class=" ur_button"  >下一页</a>
+    <ul class="wlist">
+      <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+    </ul>
+    <div class="cl"></div>
+    <div class="ur_buttons" style="width: 100px;">
       <a href="#" class="ur_button" >提交</a>
     </div>
     <div class="cl"></div>
diff --git a/db/migrate/20150114022710_add_question_number_to_poll_questions.rb b/db/migrate/20150114022710_add_question_number_to_poll_questions.rb
new file mode 100644
index 000000000..71f0328be
--- /dev/null
+++ b/db/migrate/20150114022710_add_question_number_to_poll_questions.rb
@@ -0,0 +1,9 @@
+class AddQuestionNumberToPollQuestions < ActiveRecord::Migration
+  def self.up
+    add_column :poll_questions, :question_number, :integer
+  end
+
+  def self.down
+    remove_column :poll_questions, :question_number
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index a58602e37..53d57d748 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150112080435) do
+ActiveRecord::Schema.define(:version => 20150114022710) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -815,8 +815,9 @@ ActiveRecord::Schema.define(:version => 20150112080435) do
     t.integer  "question_type"
     t.integer  "is_necessary"
     t.integer  "poll_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
+    t.datetime "created_at",      :null => false
+    t.datetime "updated_at",      :null => false
+    t.integer  "question_number"
   end
 
   create_table "poll_users", :force => true do |t|

From eb2498c62c6af8f3af92641d6bd5796964ec56cf Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 14 Jan 2015 14:23:41 +0800
Subject: [PATCH 029/142] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E9=A2=98=E3=80=81=E6=96=B0=E5=A2=9E=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E3=80=81=E5=88=A0=E9=99=A4=E9=80=89=E9=A1=B9=E7=AD=89?=
 =?UTF-8?q?js=202.=E4=BF=AE=E6=94=B9=E9=97=AE=E5=8D=B7layout=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=203.=E5=A2=9E=E5=8A=A0=E6=96=B0=E5=A2=9E=E5=8D=95?=
 =?UTF-8?q?=E9=80=89=E9=A2=98=E7=A1=AE=E5=AE=9A=E6=8C=89=E9=92=AE=E7=9A=84?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E4=BB=A5=E5=8F=8A=E7=9B=B8=E5=85=B3action?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb       |  8 ++--
 app/views/poll/_edit_MC.html.erb         | 55 +++++++++++-------------
 app/views/poll/_poll_form.html.erb       | 17 ++++++++
 app/views/poll/_question_answer.html.erb | 11 +++++
 config/routes.rb                         |  2 +-
 5 files changed, 58 insertions(+), 35 deletions(-)
 create mode 100644 app/views/poll/_question_answer.html.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 9177e044b..e1439b7f9 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -54,7 +54,9 @@ class PollController < ApplicationController
   end
 
   def edit
-
+    respond_to do |format|
+      format.html{render :layout => 'base_courses'}
+    end
   end
 
   def update
@@ -82,8 +84,8 @@ class PollController < ApplicationController
   end
 
   #添加单选题
-  def add_mc
-
+  def create_poll_question
+    a = 1
   end
 
   private
diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index 73d967ca9..492126827 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -1,33 +1,26 @@
-<div><!--编辑单选start-->
-  <div class="ur_editor radio">
-    <div class="ur_editor_title">
-      <label >问题：&nbsp;&nbsp;</label>
-      <input class="ur_question_title" type="text" name="title" placeholder="请输入单选题标题"/>
-      <input type="checkbox" name="required" value="true" checked=""/>
-      <label >必答</label>
-    </div>
-    <div class="ur_editor_content">
-      <ul>
-        <li class="ur_item">
-          <label   >选项 <span class="ur_index">01</span>： </label>
-          <input  type="text" name="option" placeholder="新建选项"/>
-          <a class="icon_add" title="向下插入选项"></a>
-          <a class="icon_remove"  title="删除"></a>
-        </li>
+<%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%>
+    <div>
+      <!--编辑单选start-->
+      <div class="ur_editor radio">
+        <div class="ur_editor_title">
+          <label>问题：&nbsp;&nbsp;</label>
+          <input class="ur_question_title" type="text" name="poll_questions_title" placeholder="请输入单选题标题"/>
+          <input type="checkbox" name="is_necessary" value="true" checked/>
+          <label>必答</label>
+        </div>
+        <div class="ur_editor_content">
+          <ul>
+            <%= render :partial => 'question_answer'%>
+            <%= render :partial => 'question_answer'%>
+            <%= render :partial => 'question_answer'%>
+          </ul>
+        </div>
+        <div class="ur_editor_footer">
+          <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().parent().submit();">确定</a>
+          <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().parent().remove();">取消</a>
+        </div>
         <div class="cl"></div>
-        <li class="ur_item">
-          <label  >选项 <span class="ur_index">01</span>： </label>
-          <input  type="text" name="option" placeholder="新建选项"/>
-          <a class="icon_add" title="向下插入选项"></a>
-          <a class="icon_remove"  title="删除"></a>
-        </li>
-        <div class="cl"></div>
-      </ul>
+      </div>
+      <!--编辑单选 end-->
     </div>
-    <div class="ur_editor_footer">
-      <a class="btn btn_dark btn_submit" data-button="ok">确定</a>
-      <a class="btn btn_light btn_cancel" data-button="cancel">取消</a>
-    </div>
-    <div class="cl"></div>
-  </div>
-</div><!--编辑单选 end-->
\ No newline at end of file
+<% end%>
\ No newline at end of file
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index 0387bb9c6..a8ad46694 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -10,6 +10,22 @@
       function add_MCQ(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_MCQ') %>");}
       function add_single(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_single') %>");}
       function add_mulit(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_mulit') %>");}
+      //单选题
+      function add_single_answer(doc)
+      {
+          doc.parent().after("<%= escape_javascript(render :partial => 'question_answer') %>");
+      }
+      function remove_single_answer(doc)
+      {
+          if(doc.parent().siblings("li").length == 0)
+          {
+              doc.parent().parent().parent().parent().parent().parent().remove();
+          }
+          else
+          {
+              doc.parent().remove();
+          }
+      }
   </script>
 </head>
 
@@ -45,6 +61,7 @@
   <%= render :partial => 'edit_head'%>
 
   <div id="poll_content">
+    <%#= render :partial => 'edit_MC'%>
   </div>
 
   <div class="ur_buttons">
diff --git a/app/views/poll/_question_answer.html.erb b/app/views/poll/_question_answer.html.erb
new file mode 100644
index 000000000..765d71787
--- /dev/null
+++ b/app/views/poll/_question_answer.html.erb
@@ -0,0 +1,11 @@
+<li class="ur_item">
+  <label>
+    选项
+    <span class="ur_index">
+    </span>：
+  </label>
+  <input type="text" name="option" 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>
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index af0b75ae7..d2d0c73a8 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -61,7 +61,7 @@ RedmineApp::Application.routes.draw do
   resources :poll do
     member do
       get 'statistics_result'
-      get 'add_mc'
+      post 'create_poll_question'
     end
   end
 

From 0433f7c87f551b4544e267b335c571a36bde130a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 14 Jan 2015 15:35:04 +0800
Subject: [PATCH 030/142] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E9=A2=98=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb | 25 +++++++++++++++++++++++--
 app/views/poll/_edit_MC.html.erb   | 11 ++++++++---
 app/views/poll/_poll_form.html.erb |  4 +++-
 config/locales/zh.yml              |  2 ++
 db/schema.rb                       | 12 ------------
 5 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index b3fdf5087..99287e2cd 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -1,5 +1,5 @@
 class PollController < ApplicationController
-  before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result]
+  before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question]
   before_filter :find_container, :only => [:new,:create, :index]
   before_filter :is_member_of_course, :only => [:index,:show]
   before_filter :is_course_teacher, :only => [:new,:create,:edit,:update,:destroy]
@@ -85,7 +85,28 @@ class PollController < ApplicationController
 
   #添加单选题
   def create_poll_question
-    a = 1
+    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,
+        :question_title => question_title,
+        :question_type => params[:question_type] || 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 => params[:question_answer].values[i-1]
+        }
+        @poll_questions.poll_answers.new question_option
+      end
+    end
+    if @poll_questions.save
+      respond_to do |format|
+        format.js
+      end
+    end
   end
 
   private
diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index 492126827..bf120a20a 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -4,15 +4,20 @@
       <div class="ur_editor radio">
         <div class="ur_editor_title">
           <label>问题：&nbsp;&nbsp;</label>
+          <input type="hidden" name="question_type" value="1"/>
           <input class="ur_question_title" type="text" name="poll_questions_title" placeholder="请输入单选题标题"/>
           <input type="checkbox" name="is_necessary" value="true" checked/>
           <label>必答</label>
         </div>
         <div class="ur_editor_content">
           <ul>
-            <%= render :partial => 'question_answer'%>
-            <%= render :partial => 'question_answer'%>
-            <%= render :partial => 'question_answer'%>
+            <li class='ur_item'>
+              <label>选项<span class='ur_index'></span>：</label>
+              <input 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>
           </ul>
         </div>
         <div class="ur_editor_footer">
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index a8ad46694..e2e9a217d 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -13,7 +13,9 @@
       //单选题
       function add_single_answer(doc)
       {
-          doc.parent().after("<%= escape_javascript(render :partial => 'question_answer') %>");
+          doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：</label><input type='text' name='question_answer["+(doc.parent().siblings("li").length + 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>");
       }
       function remove_single_answer(doc)
       {
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index d130cc666..9dae54818 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2249,5 +2249,7 @@ zh:
   label_MCQ: 多选题
   label_single: 单行文字
   label_mulit: 多行文字
+  label_enter_single_title: 请输入单选题标题
+  label_new_answer: 新建选项
 
 
diff --git a/db/schema.rb b/db/schema.rb
index 53d57d748..2120080a0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -23,18 +23,6 @@ ActiveRecord::Schema.define(:version => 20150114022710) do
   add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
   add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
 
-  create_table "api_keys", :force => true do |t|
-    t.string   "access_token"
-    t.datetime "expires_at"
-    t.integer  "user_id"
-    t.boolean  "active",       :default => true
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-  end
-
-  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
-  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
-
   create_table "applied_projects", :force => true do |t|
     t.integer "project_id", :null => false
     t.integer "user_id",    :null => false

From 2bba0ddd704485a7577db823157774c5284fbf28 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Wed, 14 Jan 2015 16:08:56 +0800
Subject: [PATCH 031/142] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E3=80=8A=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E5=8A=A0=E5=85=A5=E9=99=84=E4=BB=B6=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=8A=E7=A7=81=E6=9C=89=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=99=BB=E5=BD=95=E3=80=8B=20Signed-off-by:?=
 =?UTF-8?q?=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb | 36 +++++++++++++++++++++--
 app/controllers/attachments_controller.rb |  3 +-
 app/controllers/issues_controller.rb      |  3 +-
 app/models/mailer.rb                      | 25 ++++++++++++++--
 app/views/mailer/issue_add.html.erb       | 11 +++++++
 app/views/mailer/issue_add.text.erb       |  4 +++
 6 files changed, 76 insertions(+), 6 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1e7ccb952..a017753f6 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -248,8 +248,8 @@ class ApplicationController < ActionController::Base
       end
     end
   end
-  def authorize1(ctrl = params[:controller], action = params[:action],login = params[:user_name],pwd = params[:password], global = false)
-    #modify by NWB
+  def authorize1(ctrl = params[:controller], action = params[:action],login = params[:user_name],password = params[:password], global = false)
+
     if(!User.current.logged? && !login.nil?)
       password_authentication
     end
@@ -278,6 +278,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)
@@ -306,6 +307,37 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def authorize_attachment_download1(ctrl = params[:controller], action = params[:action],login = params[:user_name],password = params[:password], global = false)
+    if(!User.current.logged? && !login.nil?)
+      password_authentication
+    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
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 952dcdf44..2c6a002b4 100644
--- 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'
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 3d270da05..c0d83fdcd 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -19,11 +19,12 @@ 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 :authorize1, :except => [:index]
+  before_filter :authorize, :except => [:index]
 
   before_filter :find_optional_project, :only => [:index]
   before_filter :check_for_default_issue_status, :only => [:new, :create]
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 9f599916f..327dd6b4a 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -110,7 +110,12 @@ class Mailer < ActionMailer::Base
     else
       @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id)
     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")
     mail :to => recipients,
       :cc => cc,
       :subject => "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] (#{issue.status.name}) #{issue.subject}"
@@ -132,6 +137,12 @@ class Mailer < ActionMailer::Base
     references issue
     @author = journal.user
     recipients = journal.recipients
+    if recipients.include? "547533434@qq.com"
+      @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id, :anchor => "change-#{journal.id}", :user_name => 'alan', :password => 'alanlong')
+    else
+      @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id, :anchor => "change-#{journal.id}")
+    end
+
     # Watchers in cc
     cc = journal.watcher_recipients - recipients
     s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] "
@@ -139,7 +150,7 @@ class Mailer < ActionMailer::Base
     s << issue.subject
     @issue = issue
     @journal = journal
-    @issue_url = url_for(:controller => 'issues', :action => 'show', :id => issue, :anchor => "change-#{journal.id}")
+   # @issue_url = url_for(:controller => 'issues', :action => 'show', :id => issue, :anchor => "change-#{journal.id}")
     mail :to => recipients,
       :cc => cc,
       :subject => s
@@ -619,5 +630,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
diff --git a/app/views/mailer/issue_add.html.erb b/app/views/mailer/issue_add.html.erb
index 8c9da02da..da7f8ac65 100644
--- a/app/views/mailer/issue_add.html.erb
+++ b/app/views/mailer/issue_add.html.erb
@@ -1,3 +1,14 @@
+
+
 <%= l(:text_issue_added, :id => "##{@issue.project_index}", :author => h(@issue.author)) %>
+<ul>
+
+    <% unless @issue.attachments.nil? %>
+  <% @issue.attachments.each do |attach| %>
+    <li>  <%= link_to_attachment(attach, :download => true, :only_path => false) %></li>
+  <% end %>
+<% end %>
+
+</ul>
 <hr />
 <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
diff --git a/app/views/mailer/issue_add.text.erb b/app/views/mailer/issue_add.text.erb
index dbba47d49..9eef55eb4 100644
--- a/app/views/mailer/issue_add.text.erb
+++ b/app/views/mailer/issue_add.text.erb
@@ -1,4 +1,8 @@
 <%= l(:text_issue_added, :id => "##{@issue.project_index}", :author => @issue.author) %>
 
+<% @issue.attachments.each do |attach| %>
+    <%= link_to_attachment(attach, :download => true, :only_path => false) %>
+<% end %>
+
 ----------------------------------------
 <%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>

From 2a23eb8e174b9e78dd7ea087e786a0b7dc8eba18 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 14 Jan 2015 16:15:33 +0800
Subject: [PATCH 032/142] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E9=A2=98=E7=9A=84=E6=98=BE=E7=A4=BA=202.=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb         |  3 +-
 app/views/poll/_poll_form.html.erb         |  5 +++
 app/views/poll/_question_answer.html.erb   | 11 -------
 app/views/poll/_show_MC.html.erb           | 37 ++++++++++------------
 app/views/poll/create_poll_question.js.erb |  0
 5 files changed, 23 insertions(+), 33 deletions(-)
 delete mode 100644 app/views/poll/_question_answer.html.erb
 create mode 100644 app/views/poll/create_poll_question.js.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 99287e2cd..52b4d8997 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -89,7 +89,8 @@ class PollController < ApplicationController
     option = {
         :is_necessary => params[:is_necessary] || true,
         :question_title => question_title,
-        :question_type => params[:question_type] || 1
+        :question_type => params[:question_type] || 1,
+        :question_number => @poll.poll_questions.count + 1
     }
     @poll_questions = @poll.poll_questions.new option
     if params[:question_answer]
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index e2e9a217d..473c1df83 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -62,6 +62,11 @@
 
   <%= render :partial => 'edit_head'%>
 
+  <div>
+    <% @poll.poll_questions.each do |poll_question|%>
+        <%= render :partial => 'show_MC', :locals => {:poll_question => poll_question} %>
+    <% end%>
+  </div>
   <div id="poll_content">
     <%#= render :partial => 'edit_MC'%>
   </div>
diff --git a/app/views/poll/_question_answer.html.erb b/app/views/poll/_question_answer.html.erb
deleted file mode 100644
index 765d71787..000000000
--- a/app/views/poll/_question_answer.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<li class="ur_item">
-  <label>
-    选项
-    <span class="ur_index">
-    </span>：
-  </label>
-  <input type="text" name="option" 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>
\ No newline at end of file
diff --git a/app/views/poll/_show_MC.html.erb b/app/views/poll/_show_MC.html.erb
index b156bc0bc..a33967ffd 100644
--- a/app/views/poll/_show_MC.html.erb
+++ b/app/views/poll/_show_MC.html.erb
@@ -1,10 +1,13 @@
 <div class="ur_question_item radio ur_editor02">
   <div class="ur_title">
     <span class="title_index">
-      第<%= question_index%>题：
+      第<%= poll_question.question_number%>题：
     </span>
-    <%= poll_questions.question_title%>
-    <span class="ur_required" title="必答">*</span>
+    <%= poll_question.question_title %>
+    <%if poll_question.is_necessary == 1%>
+        <span class="ur_required" title="必答">*</span>
+    <%end%>
+
   </div>
   <a href="#" class="ur_icon_de" title="删除"></a>
   <a href="#" class="ur_icon_edit" title="编辑"></a>
@@ -12,24 +15,16 @@
   <div class="ur_inputs">
     <table class="ur_table" >
       <tbody>
-      <tr>
-        <td>
-          <label >
-            <input class="ur_radio" type="radio" value="新建选项" >
-            新建选项
-          </label>
-        </td>
-      </tr>
-      <tr >
-        <td>
-          <label ><input class="ur_radio" type="radio" value="新建选项" > 新建选项</label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <label ><input class="ur_radio" type="radio" value="新建选项" > 新建选项</label>
-        </td>
-      </tr>
+      <% 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>
diff --git a/app/views/poll/create_poll_question.js.erb b/app/views/poll/create_poll_question.js.erb
new file mode 100644
index 000000000..e69de29bb

From 99ffc8a6434a1b33724142727eafe59ea068af90 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 14 Jan 2015 16:33:24 +0800
Subject: [PATCH 033/142] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E9=A2=98=E6=9C=893=E4=B8=AA=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_edit_MC.html.erb | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index bf120a20a..0f031f61c 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -18,6 +18,20 @@
               <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 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 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">

From b63b4974ebb58fbbf28f19051f63a837ec1a6075 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 14 Jan 2015 16:36:30 +0800
Subject: [PATCH 034/142] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb        |   4 +-
 app/views/poll/_choice_show.html.erb      |  24 +++
 app/views/poll/statistics_result.html.erb | 185 +---------------------
 db/schema.rb                              |  52 +++++-
 4 files changed, 83 insertions(+), 182 deletions(-)
 create mode 100644 app/views/poll/_choice_show.html.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 9177e044b..f9a07b134 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -76,11 +76,12 @@ class PollController < ApplicationController
   end
 
   def statistics_result
+    @poll_questions = PollQuestion.all
     respond_to do |format|
       format.html{render :layout => 'base_courses'}
     end
   end
-
+  
   #添加单选题
   def add_mc
 
@@ -114,4 +115,5 @@ class PollController < ApplicationController
   def is_course_teacher
     render_403 unless(@course && User.current.allowed_to?(:as_teacher,@course))
   end
+  
 end
\ No newline at end of file
diff --git a/app/views/poll/_choice_show.html.erb b/app/views/poll/_choice_show.html.erb
new file mode 100644
index 000000000..a37ca148a
--- /dev/null
+++ b/app/views/poll/_choice_show.html.erb
@@ -0,0 +1,24 @@
+<div class="ur_table_result">
+        <table  border="0" cellspacing="0" cellpadding="0" >
+          <tbody>
+          <tr class="table_bluebg">
+            <td class="td327">选项 </td>
+            <td class="td42">小计 </td>
+            <td class="td287">比例 </td>
+          </tr>
+          <% poll_question.poll_answers.each do |poll_answer| %>
+          <tr>
+            <td class="td327"><%= poll_answer.answer_text %> </td>
+            <td class="td42">24 </td>
+            <td class="td287"><div class="Bar"><span style="width:75%;"></span></div> 75% </td>
+          </tr>
+          <% end %>
+          <tr class="table_bluebg">
+            <td class="td327">本题有效填写人次 </td>
+            <td class="td42">26</td>
+            <td class="td287">&nbsp; </td>
+          </tr>
+          </tbody>
+        </table>
+      </div>
+
diff --git a/app/views/poll/statistics_result.html.erb b/app/views/poll/statistics_result.html.erb
index 164020cde..f0f992c90 100644
--- a/app/views/poll/statistics_result.html.erb
+++ b/app/views/poll/statistics_result.html.erb
@@ -12,190 +12,17 @@
   <h1 class="ur_page_title">某问卷统计</h1>
 </div>
 
-
+<% @poll_questions.each do |poll_question| %>
 <div class="">
   <ol>
     <li class="ur_question_item">
       <div class="ur_title_result">
-        <span class="title_index">第1题：</span>问题描述问题描述 <span class="title_index">[单选题]</span>
+        <span class="title_index">第1题：</span>问题描述问题描述<%= poll_question.question_title %> <span class="title_index">[单选题]<% poll_question.poll_answers %></span>
       </div>
-      <div class="ur_table_result">
-        <table  border="0" cellspacing="0" cellpadding="0" >
-          <tbody>
-          <tr class="table_bluebg">
-            <td class="td327">选项 </td>
-            <td class="td42">小计 </td>
-            <td class="td287">比例 </td>
-          </tr>
-          <tr>
-            <td class="td327">第一选项 </td>
-            <td class="td42">24 </td>
-            <td class="td287"><div class="Bar"><span style="width:75%;"></span></div> 75% </td>
-          </tr>
-          <tr>
-            <td class="td327">第二选项 </td>
-            <td class="td42">1 </td>
-            <td class="td287"><div class="Bar"><span style="width:3.13%;"></span></div>3.13% </td>
-          </tr>
-          <tr>
-            <td class="td327">第三选项 </td>
-            <td class="td42">1</td>
-            <td class="td287"><div class="Bar"><span style="width:3.13%;"></span></div>3.13% </td>
-          </tr>
-          <tr class="table_bluebg">
-            <td class="td327">本题有效填写人次 </td>
-            <td class="td42">26</td>
-            <td class="td287">&nbsp; </td>
-          </tr>
-          </tbody>
-        </table>
-      </div>
-    </li>
-    <li class="ur_question_item">
-      <div class="ur_title_result">
-        <span class="title_index">第1题：</span>问题描述问题描述 <span class="title_index">[单选题]</span>
-      </div>
-      <div class="ur_table_result">
-        <table  border="0" cellspacing="0" cellpadding="0" >
-          <tbody>
-          <tr class="table_bluebg">
-            <td class="td327">选项 </td>
-            <td class="td42">小计 </td>
-            <td class="td287">比例 </td>
-          </tr>
-          <tr>
-            <td class="td327">第一选项 </td>
-            <td class="td42">24 </td>
-            <td class="td287"><div class="Bar"><span style="width:75%;"></span></div> 75% </td>
-          </tr>
-          <tr>
-            <td class="td327">第二选项 </td>
-            <td class="td42">1 </td>
-            <td class="td287"><div class="Bar"><span style="width:3.13%;"></span></div>3.13% </td>
-          </tr>
-          <tr>
-            <td class="td327">第三选项 </td>
-            <td class="td42">1</td>
-            <td class="td287"><div class="Bar"><span style="width:3.13%;"></span></div>3.13% </td>
-          </tr>
-          <tr class="table_bluebg">
-            <td class="td327">本题有效填写人次 </td>
-            <td class="td42">26</td>
-            <td class="td287">&nbsp; </td>
-          </tr>
-          </tbody>
-        </table>
-      </div>
-    </li>
-    <li class="ur_question_item">
-      <div class="ur_title_result">
-        <span class="title_index">第1题：</span>问题描述问题描述 <span class="title_index">[单选题]</span>
-      </div>
-      <div class="ur_table_result">
-        <table  border="0" cellspacing="0" cellpadding="0" >
-          <tbody>
-          <tr class="table_bluebg">
-            <td class="td327">选项 </td>
-            <td class="td42">小计 </td>
-            <td class="td287">比例 </td>
-          </tr>
-          <tr>
-            <td class="td327">第一选项 </td>
-            <td class="td42">24 </td>
-            <td class="td287"><div class="Bar"><span style="width:75%;"></span></div> 75% </td>
-          </tr>
-          <tr>
-            <td class="td327">第二选项 </td>
-            <td class="td42">1 </td>
-            <td class="td287"><div class="Bar"><span style="width:3.13%;"></span></div>3.13% </td>
-          </tr>
-          <tr>
-            <td class="td327">第三选项 </td>
-            <td class="td42">1</td>
-            <td class="td287"><div class="Bar"><span style="width:3.13%;"></span></div>3.13% </td>
-          </tr>
-          <tr class="table_bluebg">
-            <td class="td327">本题有效填写人次 </td>
-            <td class="td42">26</td>
-            <td class="td287">&nbsp; </td>
-          </tr>
-          </tbody>
-        </table>
-      </div>
-    </li>
-    <li class="ur_question_item">
-      <div class="ur_title_result">
-        <span class="title_index">第1题：</span>问题描述问题描述 <span class="title_index">[单选题]</span>
-      </div>
-      <div class="ur_table_result">
-        <table  border="0" cellspacing="0" cellpadding="0" >
-          <tbody>
-          <tr class="table_bluebg">
-            <td class="td327">选项 </td>
-            <td class="td42">小计 </td>
-            <td class="td287">比例 </td>
-          </tr>
-          <tr>
-            <td class="td327">第一选项 </td>
-            <td class="td42">24 </td>
-            <td class="td287"><div class="Bar"><span style="width:75%;"></span></div> 75% </td>
-          </tr>
-          <tr>
-            <td class="td327">第二选项 </td>
-            <td class="td42">1 </td>
-            <td class="td287"><div class="Bar"><span style="width:3.13%;"></span></div>3.13% </td>
-          </tr>
-          <tr>
-            <td class="td327">第三选项 </td>
-            <td class="td42">1</td>
-            <td class="td287"><div class="Bar"><span style="width:3.13%;"></span></div>3.13% </td>
-          </tr>
-          <tr class="table_bluebg">
-            <td class="td327">本题有效填写人次 </td>
-            <td class="td42">26</td>
-            <td class="td287">&nbsp; </td>
-          </tr>
-          </tbody>
-        </table>
-      </div>
-    </li>
-    <li class="ur_question_item">
-      <div class="ur_title_result">
-        <span class="title_index">第1题：</span>问题描述问题描述 <span class="title_index">[单选题]</span>
-      </div>
-      <div class="ur_table_result">
-        <table  border="0" cellspacing="0" cellpadding="0" >
-          <tbody>
-          <tr class="table_bluebg">
-            <td class="td327">选项 </td>
-            <td class="td42">小计 </td>
-            <td class="td287">比例 </td>
-          </tr>
-          <tr>
-            <td class="td327">第一选项 </td>
-            <td class="td42">24 </td>
-            <td class="td287"><div class="Bar"><span style="width:75%;"></span></div> 75% </td>
-          </tr>
-          <tr>
-            <td class="td327">第二选项 </td>
-            <td class="td42">1 </td>
-            <td class="td287"><div class="Bar"><span style="width:3.13%;"></span></div>3.13% </td>
-          </tr>
-          <tr>
-            <td class="td327">第三选项 </td>
-            <td class="td42">1</td>
-            <td class="td287"><div class="Bar"><span style="width:3.13%;"></span></div>3.13% </td>
-          </tr>
-          <tr class="table_bluebg">
-            <td class="td327">本题有效填写人次 </td>
-            <td class="td42">26</td>
-            <td class="td287">&nbsp; </td>
-          </tr>
-          </tbody>
-        </table>
-      </div>
-    </li>
+      <%= render :partial =>'choice_show', :locals =>{ :poll_question => poll_question } %>
+    </li>    
   </ol>
+  <% end %>
   <div class="ur_buttons">
     <!--<a href="#" class=" ur_button"  >上一页</a>-->
     <!--<a href="#" class="ur_button" >下一页</a>-->
@@ -205,8 +32,6 @@
 
 </div>
 
-
-
 </div><!--问卷内容end-->
 </body>
 </html>
diff --git a/db/schema.rb b/db/schema.rb
index 9c6f4eac3..627529a57 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150112024820) do
+ActiveRecord::Schema.define(:version => 20150112090810) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -23,6 +23,18 @@ ActiveRecord::Schema.define(:version => 20150112024820) do
   add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
   add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
 
+  create_table "api_keys", :force => true do |t|
+    t.string   "access_token"
+    t.datetime "expires_at"
+    t.integer  "user_id"
+    t.boolean  "active",       :default => true
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+  end
+
+  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
+  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
+
   create_table "applied_projects", :force => true do |t|
     t.integer "project_id", :null => false
     t.integer "user_id",    :null => false
@@ -1055,6 +1067,14 @@ ActiveRecord::Schema.define(:version => 20150112024820) do
     t.string   "description"
   end
 
+  create_table "social_groups", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.integer  "user_id"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
   create_table "softapplications", :force => true do |t|
     t.string   "name"
     t.text     "description"
@@ -1270,6 +1290,36 @@ ActiveRecord::Schema.define(:version => 20150112024820) do
   add_index "versions", ["project_id"], :name => "versions_project_id"
   add_index "versions", ["sharing"], :name => "index_versions_on_sharing"
 
+  create_table "voting_choices", :force => true do |t|
+    t.integer  "poll_id",                   :null => false
+    t.string   "text",                      :null => false
+    t.datetime "created_on",                :null => false
+    t.integer  "position",   :default => 1
+  end
+
+  add_index "voting_choices", ["poll_id"], :name => "choices_poll_id"
+
+  create_table "voting_polls", :force => true do |t|
+    t.integer  "project_id", :null => false
+    t.string   "question",   :null => false
+    t.datetime "created_on", :null => false
+    t.boolean  "revote"
+  end
+
+  add_index "voting_polls", ["project_id"], :name => "polls_project_id"
+
+  create_table "voting_votes", :force => true do |t|
+    t.integer  "user_id",    :null => false
+    t.integer  "poll_id",    :null => false
+    t.integer  "choice_id",  :null => false
+    t.datetime "created_on", :null => false
+  end
+
+  add_index "voting_votes", ["choice_id"], :name => "votes_choice_id"
+  add_index "voting_votes", ["poll_id"], :name => "votes_poll_id"
+  add_index "voting_votes", ["user_id", "poll_id"], :name => "votes_user_poll_unique", :unique => true
+  add_index "voting_votes", ["user_id"], :name => "votes_user_id"
+
   create_table "watchers", :force => true do |t|
     t.string  "watchable_type", :default => "", :null => false
     t.integer "watchable_id",   :default => 0,  :null => false

From 6d82e79e7f231dcd7635991c0265d94a6f95d881 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Thu, 15 Jan 2015 09:41:19 +0800
Subject: [PATCH 035/142] =?UTF-8?q?=E7=AD=94=E9=A2=98=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb  | 22 +++++++++++++++++-
 app/helpers/poll_helper.rb          | 35 +++++++++++++++++++++++++++++
 app/views/poll/commit_answer.js.erb |  3 +++
 app/views/poll/show.html.erb        | 22 ++++++++++++++++--
 config/routes.rb                    |  1 +
 5 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 app/helpers/poll_helper.rb
 create mode 100644 app/views/poll/commit_answer.js.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 88bbfff46..3ea1934f5 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -3,7 +3,7 @@ class PollController < ApplicationController
   before_filter :find_container, :only => [:new,:create, :index]
   before_filter :is_member_of_course, :only => [:index,:show]
   before_filter :is_course_teacher, :only => [:new,:create,:edit,:update,:destroy]
-
+  include PollHelper
   def index
     if @course
       @is_teacher = User.current.allowed_to?(:as_teacher,@course)
@@ -86,6 +86,26 @@ class PollController < ApplicationController
 
   end
 
+  #提交答案
+  def commit_answer
+        @pv = get_poll_vote(User.current.id,params[:poll_question_id])
+    if params[:poll_vote][:poll_answer_id]
+      @pv.poll_answer_id = params[:poll_vote][:poll_answer_id]
+    end
+    if params[:poll_vote][:vote_text]
+      @pv.vote_text = params[:poll_vote][:vote_text]
+    end
+    @pv_saved = false
+    if @pv.save
+      @pv_saved = true
+    end
+    #respond_to do |format|
+    #  format.js
+    #  format.json
+    #end
+    render :text => "ok"
+  end
+
   private
   def find_poll_and_course
     @poll = Poll.find params[:id]
diff --git a/app/helpers/poll_helper.rb b/app/helpers/poll_helper.rb
new file mode 100644
index 000000000..202f33eaa
--- /dev/null
+++ b/app/helpers/poll_helper.rb
@@ -0,0 +1,35 @@
+# 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 get_poll_vote(user_id,poll_question_id)
+    pq = PollQuestion.find(poll_question_id)
+    if pq.question_type == 1
+      pv = PollVote.find_by_poll_question_id_and_user_id(poll_question_id,user_id)
+      if pv.nil?
+        pv = PollVote.new
+        pv.user_id = user_id
+        pv.poll_question_id = poll_question_id
+        pv
+      else
+        pv
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/app/views/poll/commit_answer.js.erb b/app/views/poll/commit_answer.js.erb
new file mode 100644
index 000000000..b698d8658
--- /dev/null
+++ b/app/views/poll/commit_answer.js.erb
@@ -0,0 +1,3 @@
+<% if @pv_saved %>
+$('#poll_vote_poll_answer_id_<%= @pv.poll_answer_id %>').checked = true;
+<% end %>
\ No newline at end of file
diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index 26daa8fc5..08dae18b2 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -4,6 +4,7 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>问卷调查_问卷页面</title>
   <%= stylesheet_link_tag  'polls', :media => 'all' %>
+  <%= javascript_heads  %>
 </head>
 
 <body>
@@ -33,20 +34,37 @@
                 </div>
                 <div class="cl"></div>
                 <div class="ur_inputs">
+                  <%= form_tag(commit_answer_poll_path(@poll),:remote => true,:id => 'form_'+ pq.id.to_s) do %>
                   <table class="ur_table" >
                     <tbody>
                       <% pq.poll_answers.each do |pa| %>
                         <tr>
                           <td>
                             <label >
-                              <input class="ur_radio" type="radio" value="新建选项" >
-                                <%= pa.answer_text %>
+                              <script>
+                                  function clickOK()
+                                  {
+
+                                      $.ajax({
+                                          type: "GET",
+                                          url: "<%= bid.comment_status == 0 ? start_anonymous_comment_bid_path(bid) : stop_anonymous_comment_bid_path(bid)%>",
+                                          data: 'text',
+                                          success: function (data) {
+
+                                          }
+                                      });
+                                  }
+                              </script>
+                              <%= radio_button "poll_vote","poll_answer_id",pa.id,:class=>"ur_radio",:onclick =>"this.form.submit();return false" %>
+                              <%= hidden_field_tag "poll_question_id",pq.id %>
+                              <%= pa.answer_text %>
                             </label>
                           </td>
                         </tr>
                       <% end %>
                     </tbody>
                   </table>
+                  <% end %>
                 </div>
               </li>
          <% elsif pq.question_type == 2 %>
diff --git a/config/routes.rb b/config/routes.rb
index af0b75ae7..931b9f919 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -62,6 +62,7 @@ RedmineApp::Application.routes.draw do
     member do
       get 'statistics_result'
       get 'add_mc'
+      post 'commit_answer'
     end
   end
 

From d2fadfda085f17d35cad7c7787f52cf5e49060b6 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Thu, 15 Jan 2015 10:11:52 +0800
Subject: [PATCH 036/142] =?UTF-8?q?=E5=8D=95=E9=80=89=E9=A2=98=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=AD=94=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb |  8 ++++----
 app/views/poll/show.html.erb       | 17 +++++++++--------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index fcc1eef61..f83ff7cb9 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -113,11 +113,11 @@ class PollController < ApplicationController
   #提交答案
   def commit_answer
         @pv = get_poll_vote(User.current.id,params[:poll_question_id])
-    if params[:poll_vote][:poll_answer_id]
-      @pv.poll_answer_id = params[:poll_vote][:poll_answer_id]
+    if params[:poll_answer_id]
+      @pv.poll_answer_id = params[:poll_answer_id]
     end
-    if params[:poll_vote][:vote_text]
-      @pv.vote_text = params[:poll_vote][:vote_text]
+    if params[:vote_text]
+      @pv.vote_text = params[:vote_text]
     end
     @pv_saved = false
     if @pv.save
diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index 08dae18b2..86815f80a 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -42,21 +42,22 @@
                           <td>
                             <label >
                               <script>
-                                  function clickOK()
+                                  function click_<%= pa.id %>(obj)
                                   {
-
                                       $.ajax({
-                                          type: "GET",
-                                          url: "<%= bid.comment_status == 0 ? start_anonymous_comment_bid_path(bid) : stop_anonymous_comment_bid_path(bid)%>",
-                                          data: 'text',
+                                          type: "post",
+                                          url: "<%= commit_answer_poll_path(@poll) %>",
+                                          data: {
+                                              poll_answer_id: <%= pa.id %>,
+                                              poll_question_id: <%= pq.id %>
+                                          },
                                           success: function (data) {
-
+                                             obj.checked = true;
                                           }
                                       });
                                   }
                               </script>
-                              <%= radio_button "poll_vote","poll_answer_id",pa.id,:class=>"ur_radio",:onclick =>"this.form.submit();return false" %>
-                              <%= hidden_field_tag "poll_question_id",pq.id %>
+                              <%= radio_button "poll_vote","poll_answer_id",pa.id,:class=>"ur_radio",:onclick =>"click_#{pa.id}(this);return false;" %>
                               <%= pa.answer_text %>
                             </label>
                           </td>

From 20c160f03f5c633d45dd8c6363f27580ebbb21b8 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 10:50:08 +0800
Subject: [PATCH 037/142] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E5=A4=B4=E3=80=81=E5=8F=96=E6=B6=88=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E5=A4=B4=E6=95=B0=E6=8D=AE=E7=9A=84=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=92=8C=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb |  8 ++++---
 app/views/poll/_edit_head.html.erb | 36 +++++++++++++-----------------
 app/views/poll/_poll_form.html.erb | 10 ++++++++-
 app/views/poll/_show_head.html.erb | 12 +++++-----
 app/views/poll/update.js.erb       |  1 +
 config/locales/zh.yml              |  2 ++
 6 files changed, 39 insertions(+), 30 deletions(-)
 create mode 100644 app/views/poll/update.js.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 52b4d8997..196b3c7ba 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -60,12 +60,14 @@ class PollController < ApplicationController
   end
 
   def update
-    @poll.polls_name = params[:polls_name]
+    @poll.polls_name = params[:polls_name].empty? ? l(:label_poll_title) : params[:polls_name]
+    @poll.polls_description = params[:polls_description].empty? ? l(:label_poll_description) : params[:polls_description]
     if @poll.save
       respond_to do |format|
-        format.html { redirect_to poll_index_url(:polls_type => @course.class.to_s, :polls_group_id => @course.id) }
+        format.js
       end
     else
+      render_404
     end
   end
 
@@ -98,7 +100,7 @@ class PollController < ApplicationController
         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 => params[:question_answer].values[i-1]
+            :answer_text => answer
         }
         @poll_questions.poll_answers.new question_option
       end
diff --git a/app/views/poll/_edit_head.html.erb b/app/views/poll/_edit_head.html.erb
index 759fe58a1..7662c12e0 100644
--- a/app/views/poll/_edit_head.html.erb
+++ b/app/views/poll/_edit_head.html.erb
@@ -1,21 +1,15 @@
-<script type="text/javascript">
-  function regexPollsTitle()
-  {
-      var polls_title = $.trim($("#polls_title").val());
-      alert(polls_title);
-  }
-</script>
-<div class="ur_editor ur_title_editor"> <!--编辑头部start-->
-  <div class="ur_title_editor_title">
-    <input type="text" name="title" id="polls_title" class="input_title" placeholder="问卷标题" onkeyup="regexPollsTitle();"/>
-  </div>
-  <div class="ur_title_editor_prefix">
-    <textarea name="prefix"  class="textarea_editor" placeholder="问卷描述">
-    </textarea>
-  </div>
-  <div class="ur_editor_footer">
-    <a class="btn_submit" data-button="ok">确定</a>
-    <a class="btn_cancel" data-button="cancel">取消</a>
-  </div>
-  <div class="cl"></div>
-</div><!--编辑头部 end-->
\ No newline at end of file
+<%= form_for @poll,:remote => true do |f|%>
+    <div class="ur_editor ur_title_editor"> <!--编辑头部start-->
+      <div class="ur_title_editor_title">
+        <input type="text" 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" class="textarea_editor"><%= @poll.polls_description%></textarea>
+      </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="pollsCancel();">取消</a>
+      </div>
+      <div class="cl"></div>
+    </div><!--编辑头部 end-->
+<% end%>
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index 473c1df83..474f3be29 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -10,6 +10,11 @@
       function add_MCQ(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_MCQ') %>");}
       function add_single(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_single') %>");}
       function add_mulit(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_mulit') %>");}
+      //问卷头
+      function pollsCancel()
+      {
+          $("#polls_head").html("<%= escape_javascript(render :partial => 'show_head', :locals => {:poll => @poll}) %>");
+      }
       //单选题
       function add_single_answer(doc)
       {
@@ -60,7 +65,10 @@
     <div class="cl"></div>
   </div><!--选项 end-->
 
-  <%= render :partial => 'edit_head'%>
+  <div id="polls_head">
+    <%#= render :partial => 'show_head', :locals => {:poll => @poll}  %>
+    <%= render :partial => 'edit_head', :locals => {:poll => @poll}%>
+  </div>
 
   <div>
     <% @poll.poll_questions.each do |poll_question|%>
diff --git a/app/views/poll/_show_head.html.erb b/app/views/poll/_show_head.html.erb
index f8a2d58f0..28741843d 100644
--- a/app/views/poll/_show_head.html.erb
+++ b/app/views/poll/_show_head.html.erb
@@ -1,8 +1,10 @@
-<div class="ur_page_head ur_editor02" ><!--头部显示 start-->
-  <h1 class="ur_page_title">标题标题标题标题标题标题标题</h1>
-  <p class="ur_prefix_content">描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述描述
-    描述描述描述描述描述描述描述描述描述描述描述描述
-  </p>
+<div class="ur_page_head ur_editor02"><!--头部显示 start-->
   <a href="#" class="ur_icon_edit" title="编辑"></a>
+  <h1 class="ur_page_title">
+    <%= poll.polls_name%>
+  </h1>
+  <p class="ur_prefix_content">
+    <%= @poll.polls_description%>
+  </p>
   <div class="cl"></div>
 </div><!--头部显示 end-->
\ No newline at end of file
diff --git a/app/views/poll/update.js.erb b/app/views/poll/update.js.erb
new file mode 100644
index 000000000..e83b1b9f0
--- /dev/null
+++ b/app/views/poll/update.js.erb
@@ -0,0 +1 @@
+$("#polls_head").html("<%= escape_javascript(render :partial => 'show_head', :locals => {:poll => @poll}) %>");
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 9dae54818..95ab07d5d 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2251,5 +2251,7 @@ zh:
   label_mulit: 多行文字
   label_enter_single_title: 请输入单选题标题
   label_new_answer: 新建选项
+  label_poll_title: 问卷标题
+  label_poll_description: 问卷描述
 
 

From 496ef94b97ac7073ec46159c9653ea96284165f1 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 11:05:19 +0800
Subject: [PATCH 038/142] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=A4=B4=E9=A1=B5=E9=9D=A2js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll_form.html.erb | 9 +++------
 app/views/poll/_show_head.html.erb | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index 474f3be29..f32eabe8f 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -11,10 +11,8 @@
       function add_single(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_single') %>");}
       function add_mulit(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_mulit') %>");}
       //问卷头
-      function pollsCancel()
-      {
-          $("#polls_head").html("<%= escape_javascript(render :partial => 'show_head', :locals => {:poll => @poll}) %>");
-      }
+      function pollsCancel(){$("#polls_head").html("<%= escape_javascript(render :partial => 'show_head', :locals => {:poll => @poll}) %>");}
+      function pollsEdit(){$("#polls_head").html("<%= escape_javascript(render :partial => 'edit_head', :locals => {:poll => @poll}) %>");}
       //单选题
       function add_single_answer(doc)
       {
@@ -66,8 +64,7 @@
   </div><!--选项 end-->
 
   <div id="polls_head">
-    <%#= render :partial => 'show_head', :locals => {:poll => @poll}  %>
-    <%= render :partial => 'edit_head', :locals => {:poll => @poll}%>
+    <%= render :partial => 'show_head', :locals => {:poll => @poll}%>
   </div>
 
   <div>
diff --git a/app/views/poll/_show_head.html.erb b/app/views/poll/_show_head.html.erb
index 28741843d..d279df64e 100644
--- a/app/views/poll/_show_head.html.erb
+++ b/app/views/poll/_show_head.html.erb
@@ -1,5 +1,5 @@
 <div class="ur_page_head ur_editor02"><!--头部显示 start-->
-  <a href="#" class="ur_icon_edit" title="编辑"></a>
+  <a href="#" class="ur_icon_edit" title="编辑" onclick="pollsEdit();"></a>
   <h1 class="ur_page_title">
     <%= poll.polls_name%>
   </h1>

From d684acf5273c038cba31ac51c412e1cc93015952 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Thu, 15 Jan 2015 11:54:30 +0800
Subject: [PATCH 039/142] =?UTF-8?q?=E5=A4=9A=E9=80=89=E9=A2=98=E7=AD=94?=
 =?UTF-8?q?=E9=A2=98=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb | 51 ++++++++++++++++++++------
 app/helpers/poll_helper.rb         | 19 ++++------
 app/views/poll/show.html.erb       | 59 +++++++++++++++++++++---------
 3 files changed, 89 insertions(+), 40 deletions(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index f83ff7cb9..1f1f67ca9 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -112,22 +112,51 @@ class PollController < ApplicationController
 
   #提交答案
   def commit_answer
-        @pv = get_poll_vote(User.current.id,params[:poll_question_id])
-    if params[:poll_answer_id]
-      @pv.poll_answer_id = params[:poll_answer_id]
-    end
-    if params[:vote_text]
-      @pv.vote_text = params[:vote_text]
-    end
-    @pv_saved = false
-    if @pv.save
-      @pv_saved = true
+    pq = PollQuestion.find(params[:poll_question_id])
+    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
+        render :text => "ok"
+      else
+        render :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
+          render :text => "true"
+        else
+          render :text => "failure"
+        end
+      else
+        if pv.delete
+          render :text => "false"
+        else
+          render :text => "failure"
+        end
+      end
+    elsif pq.question_type == 3
+    elsif pq.question_type == 4
+
     end
+
+
     #respond_to do |format|
     #  format.js
     #  format.json
     #end
-    render :text => "ok"
+
   end
 
   private
diff --git a/app/helpers/poll_helper.rb b/app/helpers/poll_helper.rb
index 202f33eaa..d612cbb97 100644
--- a/app/helpers/poll_helper.rb
+++ b/app/helpers/poll_helper.rb
@@ -18,18 +18,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module PollHelper
-  def get_poll_vote(user_id,poll_question_id)
-    pq = PollQuestion.find(poll_question_id)
-    if pq.question_type == 1
-      pv = PollVote.find_by_poll_question_id_and_user_id(poll_question_id,user_id)
-      if pv.nil?
-        pv = PollVote.new
-        pv.user_id = user_id
-        pv.poll_question_id = poll_question_id
-        pv
-      else
-        pv
-      end
+  #判断选项是否被选中
+  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
 end
\ No newline at end of file
diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index 86815f80a..2dadbd2d3 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -34,7 +34,7 @@
                 </div>
                 <div class="cl"></div>
                 <div class="ur_inputs">
-                  <%= form_tag(commit_answer_poll_path(@poll),:remote => true,:id => 'form_'+ pq.id.to_s) do %>
+                  <form>
                   <table class="ur_table" >
                     <tbody>
                       <% pq.poll_answers.each do |pa| %>
@@ -57,7 +57,7 @@
                                       });
                                   }
                               </script>
-                              <%= radio_button "poll_vote","poll_answer_id",pa.id,:class=>"ur_radio",:onclick =>"click_#{pa.id}(this);return false;" %>
+                              <%= radio_button "poll_vote","poll_answer_id",pa.id,:class=>"ur_radio",:onclick =>"click_#{pa.id}(this);return false;",:checked => answer_be_selected?(pa,User.current)  %>
                               <%= pa.answer_text %>
                             </label>
                           </td>
@@ -65,7 +65,7 @@
                       <% end %>
                     </tbody>
                   </table>
-                  <% end %>
+                  </form>
                 </div>
               </li>
          <% elsif pq.question_type == 2 %>
@@ -80,20 +80,45 @@
                 </div>
                 <div class="cl"></div>
                 <div class="ur_inputs">
-                  <table class="ur_table" >
-                    <tbody>
-                    <% pq.poll_answers.each do |pa| %>
-                        <tr>
-                          <td>
-                            <label >
-                              <input class="ur_checkbox" type="checkbox" value="新建选项" >
-                              <%= pa.answer_text %>
-                            </label>
-                          </td>
-                        </tr>
-                    <% end %>
-                    </tbody>
-                  </table>
+                  <form>
+                    <table class="ur_table" >
+                      <tbody>
+                        <% pq.poll_answers.each do |pa| %>
+                          <tr>
+                            <td>
+                              <label >
+                                <script>
+                                    function click_<%= pa.id %>(obj)
+                                    {
+                                        $.ajax({
+                                            type: "post",
+                                            url: "<%= commit_answer_poll_path(@poll) %>",
+                                            data: {
+                                                poll_answer_id: <%= pa.id %>,
+                                                poll_question_id: <%= pq.id %>
+                                            },
+                                            success: function (data) {
+                                                if(data == "true")
+                                                {
+                                                    obj.checked = true;
+                                                }
+                                                else
+                                                {
+                                                    obj.checked = false;
+                                                }
+                                            }
+                                        });
+                                    }
+                                </script>
+                                <input class="ur_checkbox" type="checkbox" onclick="click_<%= pa.id %>(this);return false;" <%= answer_be_selected?(pa,User.current) ? "checked":"" %>>
+                                <%= pa.answer_text %>
+                              </label>
+                            </td>
+                          </tr>
+                        <% end %>
+                      </tbody>
+                    </table>
+                  </form>
                 </div>
               </li>
           <% elsif pq.question_type == 3 %>

From 517c3d1ca53ceff2006e9409c47f086f485b3b54 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 13:58:50 +0800
Subject: [PATCH 040/142] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E5=88=A0=E9=99=A4=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E9=A2=98=E9=A2=98=E9=80=89=E9=A1=B9=E5=90=8E=EF=BC=8C=E5=90=8E?=
 =?UTF-8?q?=E9=9D=A2=E5=86=8D=E6=B7=BB=E5=8A=A0=E7=9A=84=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E9=A2=98=E4=B8=8E=E5=89=8D=E9=9D=A2=E5=8D=95=E9=80=89=E9=A2=98?=
 =?UTF-8?q?name=E6=9C=89=E9=87=8D=E5=A4=8D=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index f32eabe8f..d70829855 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -16,7 +16,7 @@
       //单选题
       function add_single_answer(doc)
       {
-          doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：</label><input type='text' name='question_answer["+(doc.parent().siblings("li").length + 1)+"]' placeholder='新建选项'/>" +
+          doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：</label><input 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>");
       }

From 4996b9a54694797a320a84b17d14f7b0880e0f92 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 14:09:27 +0800
Subject: [PATCH 041/142] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=97=AE=E5=8D=B7=E5=A4=B4=E4=BC=9A=E4=BD=BF?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=A4=B4=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_edit_head.html.erb |  2 +-
 app/views/poll/_poll_form.html.erb | 10 +++++++---
 app/views/poll/_show_head.html.erb |  4 ++--
 app/views/poll/update.js.erb       |  7 ++++++-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/views/poll/_edit_head.html.erb b/app/views/poll/_edit_head.html.erb
index 7662c12e0..ea36cbedf 100644
--- a/app/views/poll/_edit_head.html.erb
+++ b/app/views/poll/_edit_head.html.erb
@@ -4,7 +4,7 @@
         <input type="text" 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" class="textarea_editor"><%= @poll.polls_description%></textarea>
+        <textarea name="polls_description" id="polls_description" class="textarea_editor"><%= @poll.polls_description%></textarea>
       </div>
       <div class="ur_editor_footer">
         <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index d70829855..cc951d07f 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -11,8 +11,8 @@
       function add_single(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_single') %>");}
       function add_mulit(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_mulit') %>");}
       //问卷头
-      function pollsCancel(){$("#polls_head").html("<%= escape_javascript(render :partial => 'show_head', :locals => {:poll => @poll}) %>");}
-      function pollsEdit(){$("#polls_head").html("<%= escape_javascript(render :partial => 'edit_head', :locals => {:poll => @poll}) %>");}
+      function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
+      function pollsEdit(){$("#polls_head_edit").show();$("#polls_head_show").hide();}
       //单选题
       function add_single_answer(doc)
       {
@@ -63,9 +63,13 @@
     <div class="cl"></div>
   </div><!--选项 end-->
 
-  <div id="polls_head">
+  <!-- 头部 -->
+  <div id="polls_head_show">
     <%= render :partial => 'show_head', :locals => {:poll => @poll}%>
   </div>
+  <div id="polls_head_edit" style="display: none;">
+    <%= render :partial => 'edit_head', :locals => {:poll => @poll}%>
+  </div>
 
   <div>
     <% @poll.poll_questions.each do |poll_question|%>
diff --git a/app/views/poll/_show_head.html.erb b/app/views/poll/_show_head.html.erb
index d279df64e..ce74dc10a 100644
--- a/app/views/poll/_show_head.html.erb
+++ b/app/views/poll/_show_head.html.erb
@@ -1,9 +1,9 @@
 <div class="ur_page_head ur_editor02"><!--头部显示 start-->
   <a href="#" class="ur_icon_edit" title="编辑" onclick="pollsEdit();"></a>
-  <h1 class="ur_page_title">
+  <h1 class="ur_page_title" id="polls_name_h">
     <%= poll.polls_name%>
   </h1>
-  <p class="ur_prefix_content">
+  <p class="ur_prefix_content" id="polls_description_p">
     <%= @poll.polls_description%>
   </p>
   <div class="cl"></div>
diff --git a/app/views/poll/update.js.erb b/app/views/poll/update.js.erb
index e83b1b9f0..15d0fabd5 100644
--- a/app/views/poll/update.js.erb
+++ b/app/views/poll/update.js.erb
@@ -1 +1,6 @@
-$("#polls_head").html("<%= escape_javascript(render :partial => 'show_head', :locals => {:poll => @poll}) %>");
\ No newline at end of file
+$("#polls_title").val("<%= @poll.polls_name%>");
+$("#polls_description").val("<%= @poll.polls_description %>");
+$("#polls_name_h").html("<%= @poll.polls_name %>");
+$("#polls_description_p").html("<%= @poll.polls_description %>");
+$("#polls_head_edit").hide();
+$("#polls_head_show").show();
\ No newline at end of file

From a99d7c514537762d25c6a04de1db310f5fed39e8 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 14:40:17 +0800
Subject: [PATCH 042/142] =?UTF-8?q?1=E3=80=81=E5=88=86=E7=A6=BB=E5=87=BA?=
 =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=97=AE=E5=8D=B7=E9=97=AE=E9=A2=98=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=202=E3=80=81=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9B=B8=E5=85=B3=E8=B7=AF=E7=94=B1=E5=8F=8A?=
 =?UTF-8?q?action?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb  |  7 ++++-
 app/views/poll/_edit_MC.html.erb    | 38 +++++++++---------------
 app/views/poll/_new_MC.html.erb     | 45 +++++++++++++++++++++++++++++
 app/views/poll/_new_MCQ.html.erb    | 33 +++++++++++++++++++++
 app/views/poll/_new_mulit.html.erb  | 18 ++++++++++++
 app/views/poll/_new_single.html.erb | 13 +++++++++
 app/views/poll/_poll_form.html.erb  | 19 +++++++-----
 config/routes.rb                    |  1 +
 8 files changed, 140 insertions(+), 34 deletions(-)
 create mode 100644 app/views/poll/_new_MC.html.erb
 create mode 100644 app/views/poll/_new_MCQ.html.erb
 create mode 100644 app/views/poll/_new_mulit.html.erb
 create mode 100644 app/views/poll/_new_single.html.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 196b3c7ba..a63f9e8f6 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -89,7 +89,7 @@ class PollController < ApplicationController
   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,
+        :is_necessary => params[:is_necessary] || 1,
         :question_title => question_title,
         :question_type => params[:question_type] || 1,
         :question_number => @poll.poll_questions.count + 1
@@ -112,6 +112,11 @@ class PollController < ApplicationController
     end
   end
 
+  #修改单选题
+  def update_poll_question
+   a = 1
+  end
+
   private
   def find_poll_and_course
     @poll = Poll.find params[:id]
diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index 0f031f61c..cc52e7c6b 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -1,37 +1,25 @@
-<%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%>
+<%= form_for poll_question,:url =>update_poll_question_poll_path(@poll.id),:remote => true do |f|%>
     <div>
       <!--编辑单选start-->
       <div class="ur_editor radio">
         <div class="ur_editor_title">
           <label>问题：&nbsp;&nbsp;</label>
-          <input type="hidden" name="question_type" value="1"/>
-          <input class="ur_question_title" type="text" name="poll_questions_title" placeholder="请输入单选题标题"/>
-          <input type="checkbox" name="is_necessary" value="true" checked/>
+          <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
+          <input class="ur_question_title" type="text" name="poll_questions_title" placeholder="请输入单选题标题" value="<%= poll_question.question_title%>"/>
+          <input type="checkbox" name="is_necessary" value="true" checked = "<%= poll_question.is_necessary == 1%>"/>
           <label>必答</label>
         </div>
         <div class="ur_editor_content">
           <ul>
-            <li class='ur_item'>
-              <label>选项<span class='ur_index'></span>：</label>
-              <input 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 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 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>
+            <% poll_question.poll_answers.reorder("answer_position") do |poll_answer| %>
+                <li class='ur_item'>
+                  <label>选项<span class='ur_index'></span>：</label>
+                  <input 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">
diff --git a/app/views/poll/_new_MC.html.erb b/app/views/poll/_new_MC.html.erb
new file mode 100644
index 000000000..0f031f61c
--- /dev/null
+++ b/app/views/poll/_new_MC.html.erb
@@ -0,0 +1,45 @@
+<%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%>
+    <div>
+      <!--编辑单选start-->
+      <div class="ur_editor radio">
+        <div class="ur_editor_title">
+          <label>问题：&nbsp;&nbsp;</label>
+          <input type="hidden" name="question_type" value="1"/>
+          <input class="ur_question_title" type="text" name="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 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 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 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().parent().submit();">确定</a>
+          <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().parent().remove();">取消</a>
+        </div>
+        <div class="cl"></div>
+      </div>
+      <!--编辑单选 end-->
+    </div>
+<% end%>
\ No newline at end of file
diff --git a/app/views/poll/_new_MCQ.html.erb b/app/views/poll/_new_MCQ.html.erb
new file mode 100644
index 000000000..cf64e7f3e
--- /dev/null
+++ b/app/views/poll/_new_MCQ.html.erb
@@ -0,0 +1,33 @@
+<div><!--编辑多选start-->
+  <div class="ur_editor checkbox">
+    <div class="ur_editor_title">
+      <label >问题：&nbsp;&nbsp;</label>
+      <input class="ur_question_title" type="text" name="title" placeholder="请输入多选题题标题"/>
+      <input type="checkbox" name="required" value="true" checked=""/>
+      <label >必答</label>
+    </div>
+    <div class="ur_editor_content">
+      <ul>
+        <li class="ur_item">
+          <label>选项 <span class="ur_index">01</span>： </label>
+          <input type="text" name="option" placeholder="新建选项"/>
+          <a class="icon_add" title="向下插入选项"></a>
+          <a class="icon_remove"  title="删除"></a>
+        </li>
+        <div class="cl"></div>
+        <li class="ur_item">
+          <label >选项 <span class="ur_index">01</span>： </label>
+          <input type="text" name="option" placeholder="新建选项"/>
+          <a class="icon_add" title="向下插入选项"></a>
+          <a class="icon_remove"  title="删除"></a>
+        </li>
+        <div class="cl"></div>
+      </ul>
+    </div>
+    <div class="ur_editor_footer">
+      <a class="btn btn_dark btn_submit" data-button="ok">确定</a>
+      <a class="btn btn_light btn_cancel" data-button="cancel">取消</a>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div><!--编辑多选 end-->
\ No newline at end of file
diff --git a/app/views/poll/_new_mulit.html.erb b/app/views/poll/_new_mulit.html.erb
new file mode 100644
index 000000000..c4a9e0e0f
--- /dev/null
+++ b/app/views/poll/_new_mulit.html.erb
@@ -0,0 +1,18 @@
+<div class="ur_editor textarea"> <!--编辑多行文字start-->
+  <div class="ur_editor_title">
+    <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
+    <input id="ur_question_title" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入多行文字标题"/>
+    <input type="checkbox" name="required" value="true" id="ur_question_require" 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">确定</a>
+    <a class="btn_cancel" data-button="cancel">取消</a>
+  </div>
+  <div class="cl"></div>
+</div><!--编辑多行文字end-->
\ No newline at end of file
diff --git a/app/views/poll/_new_single.html.erb b/app/views/poll/_new_single.html.erb
new file mode 100644
index 000000000..4e98babe4
--- /dev/null
+++ b/app/views/poll/_new_single.html.erb
@@ -0,0 +1,13 @@
+<div class="ur_editor text "> <!--编辑单行文字start-->
+  <div class="ur_editor_title">
+    <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
+    <input id="ur_question_title_1" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入单行文字标题"/>
+    <input type="checkbox" name="required" value="true" id="ur_question_require_2" checked=""/>
+    <label for="ur_question_require">必答</label>
+  </div>
+  <div class="ur_editor_footer">
+    <a class="btn_submit" data-button="ok">确定</a>
+    <a class="btn_cancel" data-button="cancel">取消</a>
+  </div>
+  <div class="cl"></div>
+</div><!--编辑单行文字end-->
\ No newline at end of file
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index cc951d07f..d15f5ed0a 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -6,10 +6,10 @@
   <%= stylesheet_link_tag  'polls', :media => 'all' %>
 
   <script type="text/javascript">
-      function add_MC(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_MC') %>");}
-      function add_MCQ(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_MCQ') %>");}
-      function add_single(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_single') %>");}
-      function add_mulit(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_mulit') %>");}
+      function add_MC(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_MC') %>");}
+      function add_MCQ(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_MCQ') %>");}
+      function add_single(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_single') %>");}
+      function add_mulit(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_mulit') %>");}
       //问卷头
       function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
       function pollsEdit(){$("#polls_head_edit").show();$("#polls_head_show").hide();}
@@ -71,11 +71,14 @@
     <%= render :partial => 'edit_head', :locals => {:poll => @poll}%>
   </div>
 
-  <div>
-    <% @poll.poll_questions.each do |poll_question|%>
+  <% @poll.poll_questions.each do |poll_question|%>
+      <div id="show_polls_questions_<%= poll_question.id %>">
         <%= render :partial => 'show_MC', :locals => {:poll_question => poll_question} %>
-    <% end%>
-  </div>
+      </div>
+      <div id="edit_polls_questions_<%= poll_question.id %>" style="display: none;">
+        <%= render :partial => 'edit_MC', :locals => {:poll_question => poll_question} %>
+      </div>
+  <% end%>
   <div id="poll_content">
     <%#= render :partial => 'edit_MC'%>
   </div>
diff --git a/config/routes.rb b/config/routes.rb
index d2d0c73a8..5a533894c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -62,6 +62,7 @@ RedmineApp::Application.routes.draw do
     member do
       get 'statistics_result'
       post 'create_poll_question'
+      post 'update_poll_question'
     end
   end
 

From a1f21f3ebba86fe91cef13831bcbd769b3d03c55 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 16:10:24 +0800
Subject: [PATCH 043/142] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA=E9=A2=98=E7=9B=AE?=
 =?UTF-8?q?=202=E3=80=81=E6=96=B0=E5=A2=9E=E9=A2=98=E7=9B=AE=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=BB=BA=E9=A2=98=E7=9B=AE=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=84=A6=E7=82=B9=203=E3=80=81=E6=96=B0=E5=A2=9E=E9=A2=98?=
 =?UTF-8?q?=E7=9B=AE=E5=90=8E=E9=A1=B5=E9=9D=A2=E4=BA=8B=E4=BB=B6=E6=94=B9?=
 =?UTF-8?q?=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_new_MC.html.erb            | 82 +++++++++++-----------
 app/views/poll/_new_MCQ.html.erb           |  2 +-
 app/views/poll/_new_mulit.html.erb         |  2 +-
 app/views/poll/_new_single.html.erb        |  2 +-
 app/views/poll/_poll_form.html.erb         | 44 ++++++++----
 app/views/poll/create_poll_question.js.erb |  1 +
 public/javascripts/polls.js                | 65 +++++++++++++++++
 7 files changed, 141 insertions(+), 57 deletions(-)
 create mode 100644 public/javascripts/polls.js

diff --git a/app/views/poll/_new_MC.html.erb b/app/views/poll/_new_MC.html.erb
index 0f031f61c..061105a77 100644
--- a/app/views/poll/_new_MC.html.erb
+++ b/app/views/poll/_new_MC.html.erb
@@ -1,45 +1,45 @@
 <%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%>
-    <div>
-      <!--编辑单选start-->
-      <div class="ur_editor radio">
-        <div class="ur_editor_title">
-          <label>问题：&nbsp;&nbsp;</label>
-          <input type="hidden" name="question_type" value="1"/>
-          <input class="ur_question_title" type="text" name="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 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 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 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().parent().submit();">确定</a>
-          <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().parent().remove();">取消</a>
-        </div>
-        <div class="cl"></div>
+  <div>
+    <!--编辑单选start-->
+    <div class="ur_editor radio">
+      <div class="ur_editor_title">
+        <label>问题：&nbsp;&nbsp;</label>
+        <input type="hidden" name="question_type" value="1"/>
+        <input 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>
-      <!--编辑单选 end-->
+      <div class="ur_editor_content">
+        <ul>
+          <li class='ur_item'>
+            <label>选项<span class='ur_index'></span>：</label>
+            <input 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 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 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().parent().submit();">确定</a>
+        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().parent().parent().remove();">取消</a>
+      </div>
+      <div class="cl"></div>
     </div>
+    <!--编辑单选 end-->
+  </div>
 <% end%>
\ No newline at end of file
diff --git a/app/views/poll/_new_MCQ.html.erb b/app/views/poll/_new_MCQ.html.erb
index cf64e7f3e..6739c233e 100644
--- a/app/views/poll/_new_MCQ.html.erb
+++ b/app/views/poll/_new_MCQ.html.erb
@@ -2,7 +2,7 @@
   <div class="ur_editor checkbox">
     <div class="ur_editor_title">
       <label >问题：&nbsp;&nbsp;</label>
-      <input class="ur_question_title" type="text" name="title" placeholder="请输入多选题题标题"/>
+      <input class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title" placeholder="请输入多选题题标题"/>
       <input type="checkbox" name="required" value="true" checked=""/>
       <label >必答</label>
     </div>
diff --git a/app/views/poll/_new_mulit.html.erb b/app/views/poll/_new_mulit.html.erb
index c4a9e0e0f..6c3528473 100644
--- a/app/views/poll/_new_mulit.html.erb
+++ b/app/views/poll/_new_mulit.html.erb
@@ -1,7 +1,7 @@
 <div class="ur_editor textarea"> <!--编辑多行文字start-->
   <div class="ur_editor_title">
     <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
-    <input id="ur_question_title" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入多行文字标题"/>
+    <input id="poll_questions_title" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title" placeholder="请输入多行文字标题"/>
     <input type="checkbox" name="required" value="true" id="ur_question_require" checked=""/>
     <label for="ur_question_require">必答</label>
   </div>
diff --git a/app/views/poll/_new_single.html.erb b/app/views/poll/_new_single.html.erb
index 4e98babe4..b7d5a9725 100644
--- a/app/views/poll/_new_single.html.erb
+++ b/app/views/poll/_new_single.html.erb
@@ -1,7 +1,7 @@
 <div class="ur_editor text "> <!--编辑单行文字start-->
   <div class="ur_editor_title">
     <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
-    <input id="ur_question_title_1" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入单行文字标题"/>
+    <input id="poll_questions_title" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入单行文字标题"/>
     <input type="checkbox" name="required" value="true" id="ur_question_require_2" checked=""/>
     <label for="ur_question_require">必答</label>
   </div>
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index d15f5ed0a..a3020d62f 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -4,12 +4,25 @@
   <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(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_MC') %>");}
-      function add_MCQ(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_MCQ') %>");}
-      function add_single(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_single') %>");}
-      function add_mulit(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_mulit') %>");}
+      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 pollsEdit(){$("#polls_head_edit").show();$("#polls_head_show").hide();}
@@ -71,16 +84,21 @@
     <%= render :partial => 'edit_head', :locals => {:poll => @poll}%>
   </div>
 
-  <% @poll.poll_questions.each do |poll_question|%>
-      <div id="show_polls_questions_<%= poll_question.id %>">
-        <%= render :partial => 'show_MC', :locals => {:poll_question => poll_question} %>
-      </div>
-      <div id="edit_polls_questions_<%= poll_question.id %>" style="display: none;">
-        <%= render :partial => 'edit_MC', :locals => {:poll_question => poll_question} %>
-      </div>
-  <% end%>
+  <!-- 问题 -->
   <div id="poll_content">
-    <%#= render :partial => 'edit_MC'%>
+    <% @poll.poll_questions.each do |poll_question|%>
+        <div id="poll_questions_<%= poll_question.id%>">
+          <div id="show_poll_questions_<%= poll_question.id %>">
+            <%= render :partial => 'show_MC', :locals => {:poll_question => poll_question} %>
+          </div>
+          <div id="edit_poll_questions_<%= poll_question.id %>" style="display: none;">
+            <%= render :partial => 'edit_MC', :locals => {:poll_question => poll_question} %>
+          </div>
+        </div>
+    <% end %>
+
+    <div id="new_poll_question">
+    </div>
   </div>
 
   <div class="ur_buttons">
diff --git a/app/views/poll/create_poll_question.js.erb b/app/views/poll/create_poll_question.js.erb
index e69de29bb..b788333ef 100644
--- a/app/views/poll/create_poll_question.js.erb
+++ b/app/views/poll/create_poll_question.js.erb
@@ -0,0 +1 @@
+$("#new_poll_question").html("");
diff --git a/public/javascripts/polls.js b/public/javascripts/polls.js
new file mode 100644
index 000000000..c10bf6d1f
--- /dev/null
+++ b/public/javascripts/polls.js
@@ -0,0 +1,65 @@
+function add_MC(){
+    var now = new Date().getTime();
+    $("#poll_content").append("<div id='new_poll_question_" + now + "'>"+
+        "<form accept-charset='UTF-8' action='/poll/2/create_poll_question' class='new_poll_question' data-remote='true' id='new_poll_question' method='post'>"+
+        "<div>" +
+        "<div class='ur_editor radio'>" +
+            "<div class='ur_editor_title'>" +
+                "<label>问题：&nbsp;&nbsp;</label>" +
+                "<input type='hidden' name='question_type' value='1'/>" +
+                "<input class='ur_question_title' type='text' name='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 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 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 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().parent().submit();'>确定</a>" +
+                "<a class='btn btn_light btn_cancel' data-button='cancel' onclick='$("+ '"#new_poll_question_'  + now + '"' +").remove();'>取消</a>" +
+            "</div>" +
+            "<div class='cl'></div>" +
+        "</div>" +
+    "</div>" +
+    "</form>" +
+    "</div>");
+}
+function add_MCQ(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_MCQ') %>");}
+function add_single(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_single') %>");}
+function add_mulit(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_mulit') %>");}
+//问卷头
+function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
+function pollsEdit(){$("#polls_head_edit").show();$("#polls_head_show").hide();}
+//单选题
+function add_single_answer(doc)
+{
+  doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：</label><input 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){doc.parent().parent().parent().parent().parent().parent().remove();}else{doc.parent().remove();}
+}
\ No newline at end of file

From 5792bd77e516da39102c659d87014ae8d9740786 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 16:31:40 +0800
Subject: [PATCH 044/142] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E9=A2=98=E9=A2=98=E6=97=B6=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=9A=84=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll_form.html.erb         | 5 +++--
 app/views/poll/create_poll_question.js.erb | 9 +++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index a3020d62f..edf74c965 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -96,9 +96,10 @@
           </div>
         </div>
     <% end %>
+  </div>
 
-    <div id="new_poll_question">
-    </div>
+  <!-- 新增问题 -->
+  <div id="new_poll_question">
   </div>
 
   <div class="ur_buttons">
diff --git a/app/views/poll/create_poll_question.js.erb b/app/views/poll/create_poll_question.js.erb
index b788333ef..18f999157 100644
--- a/app/views/poll/create_poll_question.js.erb
+++ b/app/views/poll/create_poll_question.js.erb
@@ -1 +1,10 @@
 $("#new_poll_question").html("");
+$("#poll_content").append("<div id='poll_questions_<%= @poll_questions.id%>'>" +
+        "<div id='show_poll_questions_<%= @poll_questions.id %>'>" +
+            "<%= escape_javascript(render :partial => 'show_MC', :locals => {:poll_question => @poll_questions}) %>" +
+        "</div>" +
+        "<div id='edit_poll_questions_<%= @poll_questions.id %>' style='display: none;'>" +
+            "<%= escape_javascript(render :partial => 'edit_MC', :locals => {:poll_question => @poll_questions}) %>" +
+        "</div>" +
+    "</div>");
+

From 4edd9fee6409cd8a7219c7e4a9e8c88bf6c304d0 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 16:33:11 +0800
Subject: [PATCH 045/142] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E9=A2=98=E5=8F=96=E6=B6=88=E5=90=8E=E6=97=A0=E6=B3=95=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E6=B7=BB=E5=8A=A0=E5=8D=95=E9=80=89=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_new_MC.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/poll/_new_MC.html.erb b/app/views/poll/_new_MC.html.erb
index 061105a77..013bf0ed0 100644
--- a/app/views/poll/_new_MC.html.erb
+++ b/app/views/poll/_new_MC.html.erb
@@ -36,7 +36,7 @@
       </div>
       <div class="ur_editor_footer">
         <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().parent().submit();">确定</a>
-        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().parent().parent().remove();">取消</a>
+        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().parent().remove();">取消</a>
       </div>
       <div class="cl"></div>
     </div>

From f78de71814b092678b4b1be20a65f10a23db60a1 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 16:44:35 +0800
Subject: [PATCH 046/142] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E9=A2=98=E6=97=B6=E9=A1=B5=E9=9D=A2js=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_edit_MC.html.erb   |  6 +++---
 app/views/poll/_poll_form.html.erb | 10 ++++++++++
 app/views/poll/_show_MC.html.erb   |  4 ++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index cc52e7c6b..9c34e1d51 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -5,13 +5,13 @@
         <div class="ur_editor_title">
           <label>问题：&nbsp;&nbsp;</label>
           <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
-          <input class="ur_question_title" type="text" name="poll_questions_title" placeholder="请输入单选题标题" value="<%= poll_question.question_title%>"/>
+          <input 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" value="true" checked = "<%= poll_question.is_necessary == 1%>"/>
           <label>必答</label>
         </div>
         <div class="ur_editor_content">
           <ul>
-            <% poll_question.poll_answers.reorder("answer_position") do |poll_answer| %>
+            <% 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' name='question_answer[<%= poll_answer.id %>]' placeholder='新建选项' value="<%= poll_answer.answer_text%>"/>
@@ -24,7 +24,7 @@
         </div>
         <div class="ur_editor_footer">
           <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().parent().submit();">确定</a>
-          <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().parent().remove();">取消</a>
+          <a class="btn btn_light btn_cancel" data-button="cancel" onclick="pollQuestionCancel(<%= poll_question.id%>);">取消</a>
         </div>
         <div class="cl"></div>
       </div>
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index edf74c965..1387bdd02 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -26,6 +26,16 @@
       //问卷头
       function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
       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)
       {
diff --git a/app/views/poll/_show_MC.html.erb b/app/views/poll/_show_MC.html.erb
index a33967ffd..93077b5b3 100644
--- a/app/views/poll/_show_MC.html.erb
+++ b/app/views/poll/_show_MC.html.erb
@@ -9,8 +9,8 @@
     <%end%>
 
   </div>
-  <a href="#" class="ur_icon_de" title="删除"></a>
-  <a href="#" class="ur_icon_edit" title="编辑"></a>
+  <a class="ur_icon_de" title="删除" onclick=""></a>
+  <a class="ur_icon_edit" title="编辑" onclick="pollQuestionEdit(<%= poll_question.id%>);"></a>
   <div class="cl"></div>
   <div class="ur_inputs">
     <table class="ur_table" >

From 870f9bba986751f0061216b01670ec5911a1c4e9 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 16:50:06 +0800
Subject: [PATCH 047/142] =?UTF-8?q?=E5=BF=85=E7=AD=94=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AD=98=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb | 2 +-
 app/views/poll/_edit_MC.html.erb   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index a63f9e8f6..2f8a26c2a 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -89,7 +89,7 @@ class PollController < ApplicationController
   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] || 1,
+        :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
diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index 9c34e1d51..6010132fb 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -6,7 +6,7 @@
           <label>问题：&nbsp;&nbsp;</label>
           <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
           <input 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" value="true" checked = "<%= poll_question.is_necessary == 1%>"/>
+          <input type="checkbox" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
           <label>必答</label>
         </div>
         <div class="ur_editor_content">

From 3fab26214f9912f3f331a9a537e3b3fd2be0f041 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 17:15:29 +0800
Subject: [PATCH 048/142] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E9=A2=98=E5=90=8E=E9=A1=B5=E9=9D=A2=E6=95=B0=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E9=A2=98=E7=9B=AE=E7=9A=84=E8=B7=AF=E7=94=B1=E5=8F=8A=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb         | 15 +++++++++++++++
 app/views/poll/_show_MC.html.erb           |  3 ++-
 app/views/poll/delete_poll_question.js.erb |  1 +
 config/routes.rb                           |  3 +++
 4 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 app/views/poll/delete_poll_question.js.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 2f8a26c2a..191968183 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -117,6 +117,21 @@ class PollController < ApplicationController
    a = 1
   end
 
+  #删除单选题
+  def delete_poll_question
+    @poll_question = PollQuestion.find params[:poll_question]
+    poll_questions = @poll_question.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
+
   private
   def find_poll_and_course
     @poll = Poll.find params[:id]
diff --git a/app/views/poll/_show_MC.html.erb b/app/views/poll/_show_MC.html.erb
index 93077b5b3..f3fc9c8b5 100644
--- a/app/views/poll/_show_MC.html.erb
+++ b/app/views/poll/_show_MC.html.erb
@@ -9,7 +9,8 @@
     <%end%>
 
   </div>
-  <a class="ur_icon_de" title="删除" onclick=""></a>
+  <%= 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">
diff --git a/app/views/poll/delete_poll_question.js.erb b/app/views/poll/delete_poll_question.js.erb
new file mode 100644
index 000000000..ad8fe7674
--- /dev/null
+++ b/app/views/poll/delete_poll_question.js.erb
@@ -0,0 +1 @@
+$("#poll_questions_<%= @poll_question.id%>").remove();
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 5a533894c..14f23b5f4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -64,6 +64,9 @@ RedmineApp::Application.routes.draw do
       post 'create_poll_question'
       post 'update_poll_question'
     end
+    collection do
+      delete 'delete_poll_question'
+    end
   end
 
   resources :contest_notification

From 5ec27898810c751942b2c229bc17e06318c54bc9 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 17:26:56 +0800
Subject: [PATCH 049/142] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9F=90=E4=B8=80?=
 =?UTF-8?q?=E9=A2=98=E7=9B=AE=E5=90=8E=EF=BC=8C=E5=90=8E=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E9=A2=98=E7=9B=AE=E5=BA=8F=E5=8F=B7=E8=87=AA=E5=8A=A8-1?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E9=A1=B5=E9=9D=A2js=E7=9A=84?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb         |  3 ++-
 app/views/poll/_poll_content.html.erb      | 10 ++++++++++
 app/views/poll/_poll_form.html.erb         | 11 +----------
 app/views/poll/delete_poll_question.js.erb |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 app/views/poll/_poll_content.html.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 191968183..48b1af43a 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -120,7 +120,8 @@ class PollController < ApplicationController
   #删除单选题
   def delete_poll_question
     @poll_question = PollQuestion.find params[:poll_question]
-    poll_questions = @poll_question.poll.poll_questions.where("question_number > #{@poll_question.question_number}")
+    @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
diff --git a/app/views/poll/_poll_content.html.erb b/app/views/poll/_poll_content.html.erb
new file mode 100644
index 000000000..6c2e61215
--- /dev/null
+++ b/app/views/poll/_poll_content.html.erb
@@ -0,0 +1,10 @@
+<% poll.poll_questions.each do |poll_question|%>
+    <div id="poll_questions_<%= poll_question.id%>">
+      <div id="show_poll_questions_<%= poll_question.id %>">
+        <%= render :partial => 'show_MC', :locals => {:poll_question => poll_question} %>
+      </div>
+      <div id="edit_poll_questions_<%= poll_question.id %>" style="display: none;">
+        <%= render :partial => 'edit_MC', :locals => {:poll_question => poll_question} %>
+      </div>
+    </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index 1387bdd02..04d8e2f6e 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -96,16 +96,7 @@
 
   <!-- 问题 -->
   <div id="poll_content">
-    <% @poll.poll_questions.each do |poll_question|%>
-        <div id="poll_questions_<%= poll_question.id%>">
-          <div id="show_poll_questions_<%= poll_question.id %>">
-            <%= render :partial => 'show_MC', :locals => {:poll_question => poll_question} %>
-          </div>
-          <div id="edit_poll_questions_<%= poll_question.id %>" style="display: none;">
-            <%= render :partial => 'edit_MC', :locals => {:poll_question => poll_question} %>
-          </div>
-        </div>
-    <% end %>
+    <%= render :partial => 'poll_content', :locals => {:poll => @poll}%>
   </div>
 
   <!-- 新增问题 -->
diff --git a/app/views/poll/delete_poll_question.js.erb b/app/views/poll/delete_poll_question.js.erb
index ad8fe7674..85057e550 100644
--- a/app/views/poll/delete_poll_question.js.erb
+++ b/app/views/poll/delete_poll_question.js.erb
@@ -1 +1 @@
-$("#poll_questions_<%= @poll_question.id%>").remove();
\ No newline at end of file
+$("#poll_content").html("<%= escape_javascript(render :partial => 'poll_content', :locals => {:poll => @poll}) %>");
\ No newline at end of file

From 77dc9607df4fe7147ce6aa536f40315f6b633e79 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Thu, 15 Jan 2015 17:36:30 +0800
Subject: [PATCH 050/142] =?UTF-8?q?=E7=AE=80=E7=AD=94=E9=A2=98=E7=AD=94?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb    | 57 +++++++++++++++++++++++++--
 app/helpers/poll_helper.rb            | 10 +++++
 app/views/poll/_commit_alert.html.erb |  3 ++
 app/views/poll/commit_poll.js.erb     | 10 +++++
 app/views/poll/show.html.erb          | 49 ++++++++++++++++++++---
 config/routes.rb                      |  1 +
 6 files changed, 122 insertions(+), 8 deletions(-)
 create mode 100644 app/views/poll/_commit_alert.html.erb
 create mode 100644 app/views/poll/commit_poll.js.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 1f1f67ca9..531cff906 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -1,5 +1,5 @@
 class PollController < ApplicationController
-  before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question]
+  before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll]
   before_filter :find_container, :only => [:new,:create, :index]
   before_filter :is_member_of_course, :only => [:index,:show]
   before_filter :is_course_teacher, :only => [:new,:create,:edit,:update,:destroy]
@@ -146,8 +146,20 @@ class PollController < ApplicationController
           render :text => "failure"
         end
       end
-    elsif pq.question_type == 3
-    elsif pq.question_type == 4
+    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 = PollVote.new
+        pv.user_id = User.current.id
+        pv.poll_question_id = params[:poll_question_id]
+      end
+      pv.vote_text = params[:vote_text]
+      if pv.save
+        render :text => pv.vote_text
+      else
+        render :text => "failure"
+      end
+    else
 
     end
 
@@ -159,6 +171,24 @@ class PollController < ApplicationController
 
   end
 
+  #提交问卷
+  def commit_poll
+    @uncomplete_question = get_uncomplete_question(@poll)
+    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')
+      end
+    else
+
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
   private
   def find_poll_and_course
     @poll = Poll.find params[:id]
@@ -187,4 +217,25 @@ class PollController < ApplicationController
   def is_course_teacher
     render_403 unless(@course && User.current.allowed_to?(:as_teacher,@course))
   end
+
+  #获取未完成的题目
+  def get_uncomplete_question poll
+    necessary_questions = poll.poll_questions.where("#{PollQuestion.table_name}.is_necessary = 1")
+    uncomplete_question = []
+    necessary_questions.each do |question|
+      if question.poll_votes.nil? || question.poll_votes.count < 1
+        uncomplete_question << question
+      end
+    end
+    uncomplete_question
+  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
\ No newline at end of file
diff --git a/app/helpers/poll_helper.rb b/app/helpers/poll_helper.rb
index d612cbb97..1c9ecd40f 100644
--- a/app/helpers/poll_helper.rb
+++ b/app/helpers/poll_helper.rb
@@ -27,4 +27,14 @@ module PollHelper
       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
 end
\ No newline at end of file
diff --git a/app/views/poll/_commit_alert.html.erb b/app/views/poll/_commit_alert.html.erb
new file mode 100644
index 000000000..007ae5ba7
--- /dev/null
+++ b/app/views/poll/_commit_alert.html.erb
@@ -0,0 +1,3 @@
+<div id="popbox">
+  shaksdkfdks
+</div>
diff --git a/app/views/poll/commit_poll.js.erb b/app/views/poll/commit_poll.js.erb
new file mode 100644
index 000000000..e0b9960b9
--- /dev/null
+++ b/app/views/poll/commit_poll.js.erb
@@ -0,0 +1,10 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'commit_alert') %>');
+showModal('ajax-modal', '513px');
+$('#ajax-modal').css('height','200px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
+        "<a href='#' onclick='hidden_atert_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().removeClass("alert_praise");
+$('#ajax-modal').parent().css("top","50%").css("left","20%");
+$('#ajax-modal').parent().css("position","absolute");
+$('#ajax-modal').parent().addClass("alert_box");
\ No newline at end of file
diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index 2dadbd2d3..2db65ec97 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -4,7 +4,12 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>问卷调查_问卷页面</title>
   <%= stylesheet_link_tag  'polls', :media => 'all' %>
-  <%= javascript_heads  %>
+  <script type="text/javascript">
+      function hidden_atert_form(cur_page,cur_type)
+      {
+          hideModal($("#popbox"));
+      }
+  </script>
 </head>
 
 <body>
@@ -133,9 +138,27 @@
                 </div>
                 <div class="cl"></div>
                 <div class="ur_inputs">
-                  <input class="ur_text ur_textbox" type="text" size="" maxlength=""value="">
+                  <script>
+                      function onblur_<%= pq.id %>(obj)
+                      {
+                          $(window).unbind('beforeunload');
+                          $.ajax({
+                              type: "post",
+                              url: "<%= commit_answer_poll_path(@poll) %>",
+                              data: {
+                                  poll_question_id: <%= pq.id %> ,
+                                  vote_text: obj.value
+                              },
+                              success: function (data) {
+//                                 obj.value = data;
+                              }
+                          });
+
+                      }
+                  </script>
+                  <input class="ur_text ur_textbox" type="text" size="" maxlength="" value="<%= get_anwser_vote_text(pq.id,User.current.id) %>" onblur="onblur_<%= pq.id %>(this);">
                 </div>
-              </li><!--当行输入 end-->
+              </li><!--单行输入 end-->
           <% elsif pq.question_type == 4 %>
           <!-- 多行文字-->
               <li class="ur_question_item textarea">
@@ -149,7 +172,23 @@
                   </div>
                   <div class="cl"></div>
                   <div class="ur_inputs">
-                    <textarea  class="ur_textbox"  rows="5" cols="60"></textarea>
+                    <script>
+                        function onblur_<%= pq.id %>(obj)
+                        {
+                            $.ajax({
+                                type: "post",
+                                url: "<%= commit_answer_poll_path(@poll) %>",
+                                data: {
+                                    poll_question_id: <%= pq.id %> ,
+                                    vote_text: obj.innerHTML
+                                },
+                                success: function (data) {
+//                                 obj.value = data;
+                                }
+                            });
+                        }
+                    </script>
+                    <div contenteditable='true' class="ur_textbox" style="min-height: 150px;width: 100%" onblur="onblur_<%= pq.id %>(this);"><%= get_anwser_vote_text(pq.id,User.current.id) %></div>
                   </div>
                 </div>
               </li><!--多行输入 end-->
@@ -163,7 +202,7 @@
     </ul>
     <div class="cl"></div>
     <div class="ur_buttons" style="width: 100px;">
-      <a href="#" class="ur_button" >提交</a>
+      <%= link_to "提交",commit_poll_poll_path(@poll), :method => :post,:class => "ur_button",:format => 'js',:remote=>true %>
     </div>
     <div class="cl"></div>
     <div class="ur_progress_text">答题已完成 <strong class="ur_progress_number">0%</strong> </div>
diff --git a/config/routes.rb b/config/routes.rb
index 28aa7452c..2f1414a48 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -63,6 +63,7 @@ RedmineApp::Application.routes.draw do
       get 'statistics_result'
       post 'commit_answer'
       post 'create_poll_question'
+      post 'commit_poll'
     end
   end
 

From d55492b07a183410dbbc05f2d1e264e7fd047f22 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 18:17:45 +0800
Subject: [PATCH 051/142] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E9=A2=98=E7=9A=84=E8=B7=AF=E7=94=B1=E3=80=81?=
 =?UTF-8?q?action=E3=80=81=E4=BB=A5=E5=8F=8Ajs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb         |  7 ++-
 app/views/poll/_edit_MC.html.erb           | 58 +++++++++++-----------
 app/views/poll/update_poll_question.js.erb |  0
 config/routes.rb                           |  2 +-
 4 files changed, 35 insertions(+), 32 deletions(-)
 create mode 100644 app/views/poll/update_poll_question.js.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 48b1af43a..e94b0f132 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -114,7 +114,12 @@ class PollController < ApplicationController
 
   #修改单选题
   def update_poll_question
-   a = 1
+    @poll_question = PollQuestion.find params[:poll_question]
+    @poll = @poll_question.poll
+
+    respond_to do |format|
+      format.js
+    end
   end
 
   #删除单选题
diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index 6010132fb..fa0e8d802 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -1,33 +1,31 @@
-<%= form_for poll_question,:url =>update_poll_question_poll_path(@poll.id),:remote => true do |f|%>
-    <div>
-      <!--编辑单选start-->
-      <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 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" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
-          <label>必答</label>
-        </div>
-        <div class="ur_editor_content">
-          <ul>
-            <% 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' 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().parent().submit();">确定</a>
-          <a class="btn btn_light btn_cancel" data-button="cancel" onclick="pollQuestionCancel(<%= poll_question.id%>);">取消</a>
-        </div>
-        <div class="cl"></div>
+<%= form_for(poll_question,:url => update_poll_question_poll_index_path(:poll_question => poll_question.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="<%= poll_question.question_type%>"/>
+        <input 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" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
+        <label>必答</label>
       </div>
-      <!--编辑单选 end-->
+      <div class="ur_editor_content">
+        <ul>
+          <% 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' 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="pollQuestionCancel(<%= poll_question.id%>);">取消</a>
+      </div>
+      <div class="cl"></div>
     </div>
+    <!--编辑单选 end-->
 <% end%>
\ No newline at end of file
diff --git a/app/views/poll/update_poll_question.js.erb b/app/views/poll/update_poll_question.js.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/config/routes.rb b/config/routes.rb
index 14f23b5f4..e089e8420 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -62,10 +62,10 @@ RedmineApp::Application.routes.draw do
     member do
       get 'statistics_result'
       post 'create_poll_question'
-      post 'update_poll_question'
     end
     collection do
       delete 'delete_poll_question'
+      post 'update_poll_question'
     end
   end
 

From e44cc07f86af53431e890bd36e1442e695df4cba Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Thu, 15 Jan 2015 18:22:30 +0800
Subject: [PATCH 052/142] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb    |  5 +++-
 app/views/poll/_commit_alert.html.erb | 37 +++++++++++++++++++++++++--
 app/views/poll/commit_poll.js.erb     |  7 +++--
 app/views/poll/show.html.erb          |  3 +++
 4 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 531cff906..cec9b3a34 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -180,9 +180,12 @@ class PollController < ApplicationController
       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
diff --git a/app/views/poll/_commit_alert.html.erb b/app/views/poll/_commit_alert.html.erb
index 007ae5ba7..46982006c 100644
--- a/app/views/poll/_commit_alert.html.erb
+++ b/app/views/poll/_commit_alert.html.erb
@@ -1,3 +1,36 @@
-<div id="popbox">
-  shaksdkfdks
+<div id="popbox" style="text-align: center;margin-top: 25px">
+  <% if status == 0 %>
+    <h2>提交成功!</h2>
+    <%= link_to "确定", poll_index_path(:polls_group_id => @course.id,:polls_type => 'Course'),:style => 'height: 28px;
+display: block;
+width: 80px;
+color: #fff;
+background: #15bccf;
+text-align: center;
+padding-top: 4px;
+float: left;
+margin-right: 10px;'%>
+  <% elsif status == 1 %>
+    <h2 style="font-weight: normal">您还有尚未作答的题目请完成后在提交!</h2>
+    <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:style => 'height: 28px;
+display: block;
+width: 80px;
+color: #fff;
+background: #15bccf;
+text-align: center;
+padding-top: 4px;
+float: left;
+margin-right: 10px;'%>
+  <% else %>
+    <h2 style="color: #0000ff">发生未知错误，请检查您的网络。</h2>
+      <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:style => 'height: 28px;
+display: block;
+width: 80px;
+color: #fff;
+background: #15bccf;
+text-align: center;
+padding-top: 4px;
+float: left;
+margin-right: 10px;'%>
+  <% end %>
 </div>
diff --git a/app/views/poll/commit_poll.js.erb b/app/views/poll/commit_poll.js.erb
index e0b9960b9..185967513 100644
--- a/app/views/poll/commit_poll.js.erb
+++ b/app/views/poll/commit_poll.js.erb
@@ -1,10 +1,9 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'commit_alert') %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'commit_alert',:locals => {:status => @status}) %>');
 showModal('ajax-modal', '513px');
 $('#ajax-modal').css('height','200px');
 $('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
         "<a href='#' onclick='hidden_atert_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
 $('#ajax-modal').parent().removeClass("alert_praise");
-$('#ajax-modal').parent().css("top","50%").css("left","20%");
-$('#ajax-modal').parent().css("position","absolute");
+$('#ajax-modal').parent().css("top","").css("left","");
 $('#ajax-modal').parent().addClass("alert_box");
\ No newline at end of file
diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index 2db65ec97..4f9bc75aa 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -4,6 +4,9 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>问卷调查_问卷页面</title>
   <%= stylesheet_link_tag  'polls', :media => 'all' %>
+  <style type="text/css">
+      .alert_box{width:480px;height:180px;position:fixed;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
+  </style>
   <script type="text/javascript">
       function hidden_atert_form(cur_page,cur_type)
       {

From 933ad22cd263d114cf31cbdb6ea1f47a36e597e9 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Thu, 15 Jan 2015 18:35:27 +0800
Subject: [PATCH 053/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=90=8E=E6=8F=90=E7=A4=BA=E6=A1=86=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_commit_alert.html.erb | 36 +++++----------------------
 app/views/poll/commit_poll.js.erb     |  4 +--
 app/views/poll/show.html.erb          | 14 ++++++++++-
 3 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/app/views/poll/_commit_alert.html.erb b/app/views/poll/_commit_alert.html.erb
index 46982006c..76bbda416 100644
--- a/app/views/poll/_commit_alert.html.erb
+++ b/app/views/poll/_commit_alert.html.erb
@@ -1,36 +1,12 @@
 <div id="popbox" style="text-align: center;margin-top: 25px">
   <% if status == 0 %>
-    <h2>提交成功!</h2>
-    <%= link_to "确定", poll_index_path(:polls_group_id => @course.id,:polls_type => 'Course'),:style => 'height: 28px;
-display: block;
-width: 80px;
-color: #fff;
-background: #15bccf;
-text-align: center;
-padding-top: 4px;
-float: left;
-margin-right: 10px;'%>
+    <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 %>
-    <h2 style="font-weight: normal">您还有尚未作答的题目请完成后在提交!</h2>
-    <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:style => 'height: 28px;
-display: block;
-width: 80px;
-color: #fff;
-background: #15bccf;
-text-align: center;
-padding-top: 4px;
-float: left;
-margin-right: 10px;'%>
+    <h3 style="font-weight: normal;color: red">您还有尚未作答的题目请完成后在提交!</h3>
+    <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:class => 'commit'%>
   <% else %>
-    <h2 style="color: #0000ff">发生未知错误，请检查您的网络。</h2>
-      <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:style => 'height: 28px;
-display: block;
-width: 80px;
-color: #fff;
-background: #15bccf;
-text-align: center;
-padding-top: 4px;
-float: left;
-margin-right: 10px;'%>
+    <h3 style="font-weight: normal;color: red">发生未知错误，请检查您的网络。</h3>
+      <%= link_to "确定", "javascript:void(0)",:onclick => 'hidden_atert_form();',:class => 'commit'%>
   <% end %>
 </div>
diff --git a/app/views/poll/commit_poll.js.erb b/app/views/poll/commit_poll.js.erb
index 185967513..f7a1b56fe 100644
--- a/app/views/poll/commit_poll.js.erb
+++ b/app/views/poll/commit_poll.js.erb
@@ -1,6 +1,6 @@
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'commit_alert',:locals => {:status => @status}) %>');
-showModal('ajax-modal', '513px');
-$('#ajax-modal').css('height','200px');
+showModal('ajax-modal', '400px');
+$('#ajax-modal').css('height','100px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
         "<a href='#' onclick='hidden_atert_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index 4f9bc75aa..24a04ac8d 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -5,7 +5,19 @@
   <title>问卷调查_问卷页面</title>
   <%= stylesheet_link_tag  'polls', :media => 'all' %>
   <style type="text/css">
-      .alert_box{width:480px;height:180px;position:fixed;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
+    .alert_box{width:480px;height:180px;position:fixed;z-index:100;left:55%;top:50%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
+    .commit{
+        height: 28px;
+        display: block;
+        width: 80px;
+        color: #fff !important;
+        background: #15bccf;
+        text-align: center;
+        padding-top: 4px;
+        margin-left: 130px;
+        margin-top: 4px;
+        margin-right: 10px;
+    }
   </style>
   <script type="text/javascript">
       function hidden_atert_form(cur_page,cur_type)

From 5191411508a85fc96de05095f066d18cfddac193 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Thu, 15 Jan 2015 18:48:19 +0800
Subject: [PATCH 054/142] =?UTF-8?q?<=E9=82=AE=E4=BB=B6=E5=8A=A0=E5=AF=86?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD=EF=BC=8C?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=99=84=E4=BB=B6=E4=B8=8B=E8=BD=BD=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD>=20Signed-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb | 23 ++++++---
 app/helpers/application_helper.rb         |  2 +
 app/helpers/issues_helper.rb              |  7 ++-
 app/models/issue_observer.rb              | 10 ++--
 app/models/issue_overdue.rb               |  6 ++-
 app/models/journal_observer.rb            |  8 ++-
 app/models/mailer.rb                      | 63 ++++++++++++++---------
 app/models/user.rb                        |  6 ++-
 app/views/mailer/issue_add.html.erb       |  5 +-
 app/views/mailer/issue_add.text.erb       |  5 +-
 app/views/mailer/issue_edit.html.erb      |  2 +-
 app/views/mailer/issue_edit.text.erb      |  2 +-
 12 files changed, 97 insertions(+), 42 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a017753f6..fe9f6c1b6 100644
--- 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,10 +257,11 @@ class ApplicationController < ActionController::Base
       end
     end
   end
-  def authorize1(ctrl = params[:controller], action = params[:action],login = params[:user_name],password = params[:password], global = false)
+  def authorize1(ctrl = params[:controller], action = params[:action],token = params[:token], global = false)
 
-    if(!User.current.logged? && !login.nil?)
-      password_authentication
+    if(!User.current.logged? && !token.nil?)
+
+      User.current =try_to_autologin1
     end
     allowed  = authorize_allowed(params[:controller], params[:action],global)
 
@@ -307,9 +317,9 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def authorize_attachment_download1(ctrl = params[:controller], action = params[:action],login = params[:user_name],password = params[:password], global = false)
-    if(!User.current.logged? && !login.nil?)
-      password_authentication
+  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"
@@ -850,6 +860,7 @@ class ApplicationController < ActionController::Base
 
   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
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index cb88742ad..7efa02503 100644
--- 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
 
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 8390fc61c..6a708051a 100644
--- 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
-        value = link_to_attachment(atta, :download => true, :only_path => options[:only_path])
+        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'),
diff --git a/app/models/issue_observer.rb b/app/models/issue_observer.rb
index 3369387ee..50cbf2a42 100644
--- a/app/models/issue_observer.rb
+++ b/app/models/issue_observer.rb
@@ -18,8 +18,12 @@
 class IssueObserver < ActiveRecord::Observer
  
   def after_create(issue)
-    thread1=Thread.new do
-       Mailer.issue_add(issue).deliver if Setting.notified_events.include?('issue_added')
-    end 
+    Thread.start do
+      recipients = issue.recipients
+      recipients.each do |rec|
+        Mailer.issue_add(issue,rec).deliver if Setting.notified_events.include?('issue_added')
+      end
+    end
+
   end
 end
diff --git a/app/models/issue_overdue.rb b/app/models/issue_overdue.rb
index 5caec94c9..3002b74ef 100644
--- 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
diff --git a/app/models/journal_observer.rb b/app/models/journal_observer.rb
index 0357fb74d..10d3f7b4b 100644
--- a/app/models/journal_observer.rb
+++ b/app/models/journal_observer.rb
@@ -23,8 +23,12 @@ 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
+        recipients.each do |rec|
+
+          Mailer.issue_edit(journal,rec).deliver
+        end
       end
     end
   end
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 327dd6b4a..b432461c7 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -95,38 +95,45 @@ 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
-    recipients = issue.recipients
-    if recipients.include? "547533434@qq.com"
-       @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id, :user_name => 'alan', :password => 'alanlong')
-    else
-      @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id)
-    end
 
+
+    token = Token.new(:user => User.find_by_mail(recipients), :action => 'autologin')
+    token.save
+    @token = token
+     @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id,  :token => @token.value)
+
+
+    cc = issue.watcher_recipients - issue.recipients
+    subject = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] (#{issue.status.name}) #{issue.subject}"
+    mail(:to => recipients,
+         :cc => cc,
+         :subject => subject)
+  end
     # issue.attachments.each do |attach|
     #   attachments["#{attach.filename}"] = File.read("#{attach.disk_filename}")
     # end
-    cc = issue.watcher_recipients - recipients
+   # cc = issue.watcher_recipients - recipients
     #mail.attachments['test'] = File.read("#{RAILS.root}/files/2015/01/150114094010_libegl.dll")
-    mail :to => recipients,
-      :cc => cc,
-      :subject => "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] (#{issue.status.name}) #{issue.subject}"
-  end
+
+   
+
 
   # 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,
@@ -136,24 +143,34 @@ class Mailer < ActionMailer::Base
     message_id journal
     references issue
     @author = journal.user
-    recipients = journal.recipients
-    if recipients.include? "547533434@qq.com"
-      @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id, :anchor => "change-#{journal.id}", :user_name => 'alan', :password => 'alanlong')
-    else
-      @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id, :anchor => "change-#{journal.id}")
-    end
+
+
+      token = Token.new(:user => User.find_by_mail(recipients), :action => 'autologin')
+      token.save
+      @token = token
+      @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id, :anchor => "change-#{journal.id}", :token => @token.value)
+
+
+
 
     # Watchers in cc
-    cc = journal.watcher_recipients - recipients
+
+    cc = journal.watcher_recipients - journal.recipients
     s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] "
     s << "(#{issue.status.name}) " if journal.new_value_for('status_id')
     s << issue.subject
     @issue = issue
     @journal = journal
    # @issue_url = url_for(:controller => 'issues', :action => 'show', :id => issue, :anchor => "change-#{journal.id}")
-    mail :to => recipients,
-      :cc => cc,
-      :subject => s
+    mail(:to => recipients,
+         :cc => cc,
+         :subject => s)
+  end
+
+  def self.deliver_mailer(to,cc, subject)
+    mail :to => to,
+         :cc => cc,
+         :subject => subject
   end
 
   # 用户申请加入项目邮件通知
diff --git a/app/models/user.rb b/app/models/user.rb
index 735b80762..52619b038 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -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)
diff --git a/app/views/mailer/issue_add.html.erb b/app/views/mailer/issue_add.html.erb
index da7f8ac65..3f0fce917 100644
--- a/app/views/mailer/issue_add.html.erb
+++ b/app/views/mailer/issue_add.html.erb
@@ -5,10 +5,11 @@
 
     <% unless @issue.attachments.nil? %>
   <% @issue.attachments.each do |attach| %>
-    <li>  <%= link_to_attachment(attach, :download => true, :only_path => false) %></li>
+    <li>  <%= l(:label_attachment) %><%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %><%= l(:label_added) %></li>
   <% end %>
 <% end %>
 
 </ul>
 <hr />
-<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
+
+<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
\ No newline at end of file
diff --git a/app/views/mailer/issue_add.text.erb b/app/views/mailer/issue_add.text.erb
index 9eef55eb4..4fb52b94c 100644
--- a/app/views/mailer/issue_add.text.erb
+++ b/app/views/mailer/issue_add.text.erb
@@ -1,8 +1,11 @@
 <%= l(:text_issue_added, :id => "##{@issue.project_index}", :author => @issue.author) %>
 
 <% @issue.attachments.each do |attach| %>
-    <%= link_to_attachment(attach, :download => true, :only_path => false) %>
+   <%= l(:label_attachment) %>
+     <%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %> <%= l(:label_added) %>
 <% end %>
 
 ----------------------------------------
+
 <%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
+
diff --git a/app/views/mailer/issue_edit.html.erb b/app/views/mailer/issue_edit.html.erb
index be7076cb6..8af66d891 100644
--- a/app/views/mailer/issue_edit.html.erb
+++ b/app/views/mailer/issue_edit.html.erb
@@ -1,7 +1,7 @@
 <%= 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| %>
+<% details_to_strings(@journal.details, false, :only_path => false, :token => @token.value).each do |string| %>
   <li><%= string %></li>
 <% end %>
 </ul>
diff --git a/app/views/mailer/issue_edit.text.erb b/app/views/mailer/issue_edit.text.erb
index 45b8d3ecf..a5614595c 100644
--- a/app/views/mailer/issue_edit.text.erb
+++ b/app/views/mailer/issue_edit.text.erb
@@ -1,6 +1,6 @@
 <%= l(:text_issue_updated, :id => "##{@issue.project_index}", :author => @journal.user) %>
 
-<% details_to_strings(@journal.details, true).each do |string| -%>
+<% details_to_strings(@journal.details, true, :token => @token.value).each do |string| -%>
 <%= string %>
 <% end -%>
 

From f41cd0a8ab7f1d682e1df454535c1095772e8fd1 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 16 Jan 2015 10:11:17 +0800
Subject: [PATCH 055/142] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E9=A2=98=E4=B8=9A=E5=8A=A1=E9=80=BB=E8=BE=91=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=202.=E5=88=A0=E9=99=A4=E9=80=89=E9=A1=B9=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E9=A2=98=E8=87=B3=E5=B0=91=E6=9C=89=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb         | 24 ++++++++++++++++++++++
 app/views/poll/_edit_MC.html.erb           |  2 +-
 app/views/poll/_poll_form.html.erb         |  2 +-
 app/views/poll/update_poll_question.js.erb |  2 ++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 356a669b7..2f3c344cb 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -117,6 +117,30 @@ class PollController < ApplicationController
     @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|
+        @poll_question.poll_answers.destroy answer 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
diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index fa0e8d802..12dc9f92b 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -1,4 +1,4 @@
-<%= form_for(poll_question,:url => update_poll_question_poll_index_path(:poll_question => poll_question.id),:remote => true) do |f|%>
+<%= form_for("",:url => update_poll_question_poll_index_path(:poll_question => poll_question.id),:remote => true) do |f|%>
     <!--编辑单选start-->
     <div class="ur_editor radio">
       <div class="ur_editor_title">
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index 04d8e2f6e..598ef1207 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -47,7 +47,7 @@
       {
           if(doc.parent().siblings("li").length == 0)
           {
-              doc.parent().parent().parent().parent().parent().parent().remove();
+              alert("选择题至少有一个选项");
           }
           else
           {
diff --git a/app/views/poll/update_poll_question.js.erb b/app/views/poll/update_poll_question.js.erb
index e69de29bb..267a27ae2 100644
--- a/app/views/poll/update_poll_question.js.erb
+++ b/app/views/poll/update_poll_question.js.erb
@@ -0,0 +1,2 @@
+
+pollQuestionCancel(<%= @poll_question.id%>);
\ No newline at end of file

From dc2c96f59a839039ee64932cafc8b402a1466d9e Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 16 Jan 2015 10:19:38 +0800
Subject: [PATCH 056/142] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=90=8E=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E7=A6=81=E6=AD=A2=E6=9F=A5=E7=9C=8B=E4=B8=8E?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb            |  29 +-
 app/helpers/poll_helper.rb                    |  10 +
 app/views/poll/index.html.erb                 |   6 +-
 app/views/poll/show.html.erb                  |   8 +-
 .../stylesheets/window_js/mac_os_x_dialog.css | 320 +++++++++---------
 public/stylesheets/polls.css                  |   1 +
 6 files changed, 196 insertions(+), 178 deletions(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index feeb3c324..3e5e131c8 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -1,5 +1,5 @@
 class PollController < ApplicationController
-  before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll]
+  before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll,:commit_answer]
   before_filter :find_container, :only => [:new,:create, :index]
   before_filter :is_member_of_course, :only => [:index,:show]
   before_filter :is_course_teacher, :only => [:new,:create,:edit,:update,:destroy]
@@ -19,10 +19,16 @@ class PollController < ApplicationController
 
   def show
     @poll = Poll.find params[:id]
-    poll_questions = @poll.poll_questions
-    @poll_questions = paginateHelper poll_questions,3 #分页
-    respond_to do |format|
-      format.html {render :layout => 'base_courses'}
+    #已提交问卷的用户不能再访问该界面
+    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?
+      poll_questions = @poll.poll_questions
+      @poll_questions = paginateHelper poll_questions,3 #分页
+      respond_to do |format|
+        format.html {render :layout => 'base_courses'}
+      end
     end
   end
 
@@ -141,6 +147,10 @@ class PollController < ApplicationController
   #提交答案
   def commit_answer
     pq = PollQuestion.find(params[:poll_question_id])
+    if has_commit_poll?(@poll.id,User.current.id) && (!User.current.admin?)
+      render :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)
@@ -188,15 +198,8 @@ class PollController < ApplicationController
         render :text => "failure"
       end
     else
-
+      render :text => "failure"
     end
-
-
-    #respond_to do |format|
-    #  format.js
-    #  format.json
-    #end
-
   end
 
   #提交问卷
diff --git a/app/helpers/poll_helper.rb b/app/helpers/poll_helper.rb
index 1c9ecd40f..7816d8e37 100644
--- a/app/helpers/poll_helper.rb
+++ b/app/helpers/poll_helper.rb
@@ -37,4 +37,14 @@ module PollHelper
       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
 end
\ No newline at end of file
diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index 9d0bd5549..e45bdfabb 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -13,7 +13,11 @@
     <% @polls.each do |poll|%>
         <ul id="polls_<%= poll.id %>">
           <li>
-            <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
+            <% if has_commit_poll?(poll.id ,User.current) %>
+                <sapn class="polls_title fl"> <%= poll.polls_name %></sapn>
+            <% else %>
+              <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
+            <% end %>
           </li>
           <li>
             <%if @is_teacher%>
diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index 24a04ac8d..dca45c25c 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -77,7 +77,7 @@
                                       });
                                   }
                               </script>
-                              <%= radio_button "poll_vote","poll_answer_id",pa.id,:class=>"ur_radio",:onclick =>"click_#{pa.id}(this);return false;",:checked => answer_be_selected?(pa,User.current)  %>
+                              <%= radio_button "poll_vote","poll_answer_id",pa.id,:class=>"ur_radio",:onclick =>"click_#{pa.id}(this);return false;",:checked => answer_be_selected?(pa,User.current),:disabled => !@can_edit_poll %>
                               <%= pa.answer_text %>
                             </label>
                           </td>
@@ -130,7 +130,7 @@
                                         });
                                     }
                                 </script>
-                                <input class="ur_checkbox" type="checkbox" onclick="click_<%= pa.id %>(this);return false;" <%= answer_be_selected?(pa,User.current) ? "checked":"" %>>
+                                <input class="ur_checkbox" type="checkbox" onclick="click_<%= pa.id %>(this);return false;" <%= answer_be_selected?(pa,User.current) ? "checked":"" %> <%= @can_edit_poll?"":"disabled=disabled" %> >
                                 <%= pa.answer_text %>
                               </label>
                             </td>
@@ -171,7 +171,7 @@
 
                       }
                   </script>
-                  <input class="ur_text ur_textbox" type="text" size="" maxlength="" value="<%= get_anwser_vote_text(pq.id,User.current.id) %>" onblur="onblur_<%= pq.id %>(this);">
+                  <input class="ur_text ur_textbox" type="text" size="" maxlength="" value="<%= get_anwser_vote_text(pq.id,User.current.id) %>" onblur="onblur_<%= pq.id %>(this);" <%= @can_edit_poll?"":"disabled=disabled" %>>
                 </div>
               </li><!--单行输入 end-->
           <% elsif pq.question_type == 4 %>
@@ -203,7 +203,7 @@
                             });
                         }
                     </script>
-                    <div contenteditable='true' class="ur_textbox" style="min-height: 150px;width: 100%" onblur="onblur_<%= pq.id %>(this);"><%= get_anwser_vote_text(pq.id,User.current.id) %></div>
+                    <div contenteditable='<%= @can_edit_poll %>' class="ur_textbox" style="min-height: 150px;width: 100%;<%= @can_edit_poll?"":"background-color:#DCDCDC;" %>" onblur="onblur_<%= pq.id %>(this);"><%= get_anwser_vote_text(pq.id,User.current.id) %></div>
                   </div>
                 </div>
               </li><!--多行输入 end-->
diff --git a/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x_dialog.css b/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x_dialog.css
index 4c89f602d..e663e3c5e 100644
--- a/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x_dialog.css
+++ b/public/plugin_assets/redmine_code_review/stylesheets/window_js/mac_os_x_dialog.css
@@ -1,160 +1,160 @@
-.overlay_mac_os_x_dialog {
-	background-color: #FF7224;
-	filter:alpha(opacity=60);
-	-moz-opacity: 0.6;
-	opacity: 0.6;
-}
-
-.mac_os_x_dialog_nw {
-  background: transparent url(mac_os_x_dialog/L.png) repeat-y top left;			
-  width:16px;
-  height:16px;
-}
-
-.mac_os_x_dialog_n {
-	background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0;			
-  height:18px;
-}
-
-.mac_os_x_dialog_ne {
-  background: transparent url(mac_os_x_dialog/R.png) repeat-y top left;
-  width:16px;
-  height:16px;
-}
-
-.mac_os_x_dialog_w {
-  background: transparent url(mac_os_x_dialog/L.png) repeat-y top left;			
-  width:16px;
-}
-
-.mac_os_x_dialog_e {
-  background: transparent url(mac_os_x_dialog/R.png) repeat-y top right;			
-  width:16px;	  
-}
-
-.mac_os_x_dialog_sw {
-  background: transparent url(mac_os_x_dialog/BL.png) no-repeat 0 0;			
-  width:31px;
-  height:40px;
-}
-
-.mac_os_x_dialog_s {
-  background: transparent url(mac_os_x_dialog/B.png) repeat-x 0 0;			
-  height:40px;
-}
-
-.mac_os_x_dialog_se, .mac_os_x_dialog_sizer {
-  background: transparent url(mac_os_x_dialog/BR.png) no-repeat 0 0;			
-  width:31px;
-  height:40px;
-}
-
-.mac_os_x_dialog_sizer {
-	cursor:se-resize;	
-}
-
-.mac_os_x_dialog_close {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x_dialog/close.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:25px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.mac_os_x_dialog_minimize {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x_dialog/minimize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:45px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.mac_os_x_dialog_maximize {
-	width: 19px;
-	height: 19px;
-	background: transparent url(mac_os_x_dialog/maximize.gif) no-repeat 0 0;			
-	position:absolute;
-	top:12px;
-	left:65px;
-	cursor:pointer;
-	z-index:1000;
-}
-
-.mac_os_x_dialog_title {
-	float:left;
-	height:14px;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size:12px;
-	text-align:center;
-	margin-top:6px;
-	width:100%;
-	color:#000;
-}
-
-.mac_os_x_dialog_content {
-	overflow:auto;
-	color: #222;
-	font-family: Tahoma, Arial, sans-serif;
-	font-size: 10px;
-	background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0;			
-}
-
-.mac_os_x_dialog_buttons {
-  text-align: center;
-}
-/* FOR IE */
-* html .mac_os_x_dialog_nw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
-}
-
-
-* html .mac_os_x_dialog_ne {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_dialog_w {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_dialog_e {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_dialog_sw {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BL.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_dialog_s {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/B.png", sizingMethod="scale");
-}
-
-* html .mac_os_x_dialog_se {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
-}
-
-* html .mac_os_x_dialog_sizer {
-	background-color: transparent;
-	background-image: none;
-	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
-}
-
+.overlay_mac_os_x_dialog {
+	background-color: #FF7224;
+	filter:alpha(opacity=60);
+	-moz-opacity: 0.6;
+	opacity: 0.6;
+}
+
+.mac_os_x_dialog_nw {
+  background: transparent url(mac_os_x_dialog/L.png) repeat-y top left;			
+  width:16px;
+  height:16px;
+}
+
+.mac_os_x_dialog_n {
+	background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0;			
+  height:18px;
+}
+
+.mac_os_x_dialog_ne {
+  background: transparent url(mac_os_x_dialog/R.png) repeat-y top left;
+  width:16px;
+  height:16px;
+}
+
+.mac_os_x_dialog_w {
+  background: transparent url(mac_os_x_dialog/L.png) repeat-y top left;			
+  width:16px;
+}
+
+.mac_os_x_dialog_e {
+  background: transparent url(mac_os_x_dialog/R.png) repeat-y top right;			
+  width:16px;	  
+}
+
+.mac_os_x_dialog_sw {
+  background: transparent url(mac_os_x_dialog/BL.png) no-repeat 0 0;			
+  width:31px;
+  height:40px;
+}
+
+.mac_os_x_dialog_s {
+  background: transparent url(mac_os_x_dialog/B.png) repeat-x 0 0;			
+  height:40px;
+}
+
+.mac_os_x_dialog_se, .mac_os_x_dialog_sizer {
+  background: transparent url(mac_os_x_dialog/BR.png) no-repeat 0 0;			
+  width:31px;
+  height:40px;
+}
+
+.mac_os_x_dialog_sizer {
+	cursor:se-resize;	
+}
+
+.mac_os_x_dialog_close {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x_dialog/close.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:25px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.mac_os_x_dialog_minimize {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x_dialog/minimize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:45px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.mac_os_x_dialog_maximize {
+	width: 19px;
+	height: 19px;
+	background: transparent url(mac_os_x_dialog/maximize.gif) no-repeat 0 0;			
+	position:absolute;
+	top:12px;
+	left:65px;
+	cursor:pointer;
+	z-index:1000;
+}
+
+.mac_os_x_dialog_title {
+	float:left;
+	height:14px;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size:12px;
+	text-align:center;
+	margin-top:6px;
+	width:100%;
+	color:#000;
+}
+
+.mac_os_x_dialog_content {
+	overflow:auto;
+	color: #222;
+	font-family: Tahoma, Arial, sans-serif;
+	font-size: 10px;
+	background: transparent url(mac_os_x_dialog/bg.gif) repeat 0 0;			
+}
+
+.mac_os_x_dialog_buttons {
+  text-align: center;
+}
+/* FOR IE */
+* html .mac_os_x_dialog_nw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
+}
+
+
+* html .mac_os_x_dialog_ne {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_dialog_w {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/L.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_dialog_e {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/R.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_dialog_sw {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BL.png", sizingMethod="crop");
+}
+
+* html .mac_os_x_dialog_s {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/B.png", sizingMethod="scale");
+}
+
+* html .mac_os_x_dialog_se {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
+}
+
+* html .mac_os_x_dialog_sizer {
+	background-color: transparent;
+	background-image: none;
+	filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../themes/mac_os_x_dialog/BR.png", sizingMethod="crop");
+}
+
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index b13cb1da2..e89e50be4 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -27,6 +27,7 @@ a.newbtn{ float:right; display:block; width:80px; height:30px; background:#64bdd
 a:hover.newbtn{ background:#55a1b9; text-decoration:none;}
 .polls_list ul{ padding-left:10px; border-bottom:1px dashed #c9c9c9; height:32px; padding-top:8px;}
 a.polls_title{ font-weight:bold; color:#3e6d8e;}
+.polls_title{ font-weight:bold; color:#3e6d8e;}
 a.pollsbtn{ display:block; width:66px; height:22px; text-align:center; border:1px solid #64bdd9; color:#64bdd9;}
 a:hover.pollsbtn{ background:#64bdd9; color:#fff; text-decoration:none;}
 .polls_date{  color:#666666;}

From 9fb0275563b12d3416662f35a7e9b71bbc478724 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 16 Jan 2015 10:43:05 +0800
Subject: [PATCH 057/142] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E9=A2=98=E6=97=B6=E9=A1=B5=E9=9D=A2js?=
 =?UTF-8?q?=E7=9A=84=E5=88=B7=E6=96=B0=202.=E4=BF=AE=E6=94=B9=E5=8D=95?=
 =?UTF-8?q?=E9=80=89=E9=A2=98=E6=97=B6=E5=88=A0=E9=99=A4=E6=9F=90=E4=BA=9B?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E6=9C=89=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb         |  2 +-
 app/views/poll/_poll_question.html.erb     | 12 ++++++++++++
 app/views/poll/update_poll_question.js.erb |  8 ++++++--
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 app/views/poll/_poll_question.html.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 2f3c344cb..c82b9a385 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -122,7 +122,7 @@ class PollController < ApplicationController
     ################处理选项
     if params[:question_answer]
       @poll_question.poll_answers.each do |answer|
-        @poll_question.poll_answers.destroy answer unless params[:question_answer].keys.include? answer.id.to_s
+        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]
diff --git a/app/views/poll/_poll_question.html.erb b/app/views/poll/_poll_question.html.erb
new file mode 100644
index 000000000..7731c9821
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/app/views/poll/update_poll_question.js.erb b/app/views/poll/update_poll_question.js.erb
index 267a27ae2..39d0fcfd6 100644
--- a/app/views/poll/update_poll_question.js.erb
+++ b/app/views/poll/update_poll_question.js.erb
@@ -1,2 +1,6 @@
-
-pollQuestionCancel(<%= @poll_question.id%>);
\ No newline at end of file
+$("#poll_questions_<%= @poll_question.id%>").html("<div id='show_poll_questions_<%= @poll_question.id %>'>" +
+        "<%= escape_javascript(render :partial => 'show_MC', :locals => {:poll_question => @poll_question}) %>" +
+   "</div>" +
+   "<div id='edit_poll_questions_<%= @poll_question.id %>' style='display: none;'>" +
+        "<%= escape_javascript(render :partial => 'edit_MC', :locals => {:poll_question => @poll_question}) %>" +
+   "</div>");

From 34b8ffeb5bbde39d7a5d666904775ad4a4f7708a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 16 Jan 2015 10:51:08 +0800
Subject: [PATCH 058/142] tongji

---
 app/controllers/poll_controller.rb        | 16 ++++++++++++++--
 app/controllers/projects_controller.rb    |  4 ++--
 app/views/poll/_choice_show.html.erb      |  5 +++--
 app/views/poll/statistics_result.html.erb |  8 +++++---
 db/schema.rb                              |  2 +-
 5 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 084c43545..774923404 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -78,12 +78,24 @@ class PollController < ApplicationController
   end
 
   def statistics_result
-    @poll_questions = PollQuestion.all
+    @poll = Poll.find(params[:id])
+    @offset, @limit = api_offset_and_limit({:limit => 10})
+    @poll_questions = @poll.poll_questions    
+    @poll_questions_count = @poll_questions.count
+    @poll_questions_pages = Paginator.new @poll_questions_count, @limit, params['page']
     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]
@@ -111,7 +123,7 @@ class PollController < ApplicationController
     end
   end
 
-  private
+  private  
   def find_poll_and_course
     @poll = Poll.find params[:id]
     @course = Course.find @poll.polls_group_id
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 5d43a4e20..5ff9a3f17 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -116,8 +116,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
 
diff --git a/app/views/poll/_choice_show.html.erb b/app/views/poll/_choice_show.html.erb
index a37ca148a..aa425e748 100644
--- a/app/views/poll/_choice_show.html.erb
+++ b/app/views/poll/_choice_show.html.erb
@@ -1,3 +1,4 @@
+
 <div class="ur_table_result">
         <table  border="0" cellspacing="0" cellpadding="0" >
           <tbody>
@@ -9,13 +10,13 @@
           <% poll_question.poll_answers.each do |poll_answer| %>
           <tr>
             <td class="td327"><%= poll_answer.answer_text %> </td>
-            <td class="td42">24 </td>
+            <td class="td42"><% poll_answer.poll_votes.count %> </td>
             <td class="td287"><div class="Bar"><span style="width:75%;"></span></div> 75% </td>
           </tr>
           <% end %>
           <tr class="table_bluebg">
             <td class="td327">本题有效填写人次 </td>
-            <td class="td42">26</td>
+            <td class="td42"><%= poll_question.poll_votes.count %></td>
             <td class="td287">&nbsp; </td>
           </tr>
           </tbody>
diff --git a/app/views/poll/statistics_result.html.erb b/app/views/poll/statistics_result.html.erb
index f0f992c90..1bdbb0ff1 100644
--- a/app/views/poll/statistics_result.html.erb
+++ b/app/views/poll/statistics_result.html.erb
@@ -17,19 +17,21 @@
   <ol>
     <li class="ur_question_item">
       <div class="ur_title_result">
-        <span class="title_index">第1题：</span>问题描述问题描述<%= poll_question.question_title %> <span class="title_index">[单选题]<% poll_question.poll_answers %></span>
+        <span class="title_index">第<%= poll_question.question_number %>题：</span><%= poll_question.question_title %> <span class="title_index">[单选题]<% poll_question.poll_answers %></span>
       </div>
       <%= render :partial =>'choice_show', :locals =>{ :poll_question => poll_question } %>
     </li>    
   </ol>
+  <div class="pagination">
+    <%= pagination_links_full  @poll_questions_pages, @poll_questions_count %>
+  </div>
   <% end %>
   <div class="ur_buttons">
     <!--<a href="#" class=" ur_button"  >上一页</a>-->
     <!--<a href="#" class="ur_button" >下一页</a>-->
   </div>
   <div class="cl"></div>
-  <div class="ur_progress_text">答题已完成 <strong class="ur_progress_number">0%</strong> </div>
-
+  <div class="ur_progress_text">答题已完成 <strong class="ur_progress_number">0%</strong> </div> 
 </div>
 
 </div><!--问卷内容end-->
diff --git a/db/schema.rb b/db/schema.rb
index 6c2a9f58a..f9ea40ae9 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150112090810) do
+ActiveRecord::Schema.define(:version => 20150114022710) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false

From 0dc0ba3a4a36070971f9413c419b7713e3aa24c5 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 16 Jan 2015 10:59:25 +0800
Subject: [PATCH 059/142] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/index.html.erb | 68 ++++++++++++++++++++---------------
 app/views/poll/show.html.erb  |  4 ++-
 2 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index e45bdfabb..0e5e956ca 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -11,34 +11,46 @@
   <div class="cl"></div>
   <div class="polls_list">
     <% @polls.each do |poll|%>
-        <ul id="polls_<%= poll.id %>">
-          <li>
-            <% if has_commit_poll?(poll.id ,User.current) %>
-                <sapn class="polls_title fl"> <%= poll.polls_name %></sapn>
-            <% else %>
-              <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
-            <% end %>
-          </li>
-          <li>
-            <%if @is_teacher%>
-                <%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fl ml10"%>
-            <% 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%>
-                <%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml20"%>
-            <% end%>
-          </li>
-          <li class="polls_date fr">
-            <%= format_time poll.created_at%>
-          </li>
-        </ul>
+
+          <% unless !@is_teacher && poll.polls_status != 2 %>
+            <ul id="polls_<%= poll.id %>">
+              <li>
+                <% if @is_teacher %>
+                    <% if has_commit_poll?(poll.id ,User.current) %>
+                        <sapn class="polls_title fl"> <%= poll.polls_name %></sapn>
+                    <% else %>
+                        <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
+                    <% end %>
+                <% else %>
+                    <% if has_commit_poll?(poll.id ,User.current) && poll.polls_status == 2 %>
+                        <sapn class="polls_title fl"> <%= poll.polls_name %></sapn>
+                    <% elsif (!has_commit_poll?(poll.id ,User.current)) && poll.polls_status == 2 %>
+                        <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
+                    <% end %>
+                <% end %>
+              </li>
+              <li>
+                <%if @is_teacher%>
+                    <%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fl ml10"%>
+                <% end%>
+              </li>
+              <li>
+                <% if @is_teacher && poll.polls_status == 1 #新建状态的问卷可删除%>
+                    <%= 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 && poll.polls_status == 1 #新建状态的问卷可编辑%>
+                    <%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml20"%>
+                <% end%>
+              </li>
+              <li class="polls_date fr">
+                <%= format_time poll.created_at%>
+              </li>
+            </ul>
+          <% end %>
+
         <div class="cl"></div>
     <% end%>
 
diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index dca45c25c..2db0045f6 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -217,7 +217,9 @@
     </ul>
     <div class="cl"></div>
     <div class="ur_buttons" style="width: 100px;">
-      <%= link_to "提交",commit_poll_poll_path(@poll), :method => :post,:class => "ur_button",:format => 'js',:remote=>true %>
+      <% if @poll.polls_status == 2 %>
+        <%= link_to "提交",commit_poll_poll_path(@poll), :method => :post,:class => "ur_button",:format => 'js',:remote=>true %>
+      <% end %>
     </div>
     <div class="cl"></div>
     <div class="ur_progress_text">答题已完成 <strong class="ur_progress_number">0%</strong> </div>

From a683acf85c465cc75c7b7a41d54c2c8f2826fab1 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 16 Jan 2015 11:05:04 +0800
Subject: [PATCH 060/142] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E6=97=B6=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=9A=E6=96=B0=E5=BB=BA=E4=B8=80=E4=B8=AA=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index a843e9d9b..9c5f810c6 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -46,9 +46,7 @@ class PollController < ApplicationController
       }
       @poll = Poll.create option
       if @poll
-        respond_to do |format|
-          format.html{render :layout => 'base_courses'}
-        end
+        redirect_to edit_poll_url @poll.id
       end
     elsif @project
       #项目的问卷调查相关代码

From a5cf1576f1626d7eeebe79c812270e129418d4de Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 16 Jan 2015 13:44:20 +0800
Subject: [PATCH 061/142] =?UTF-8?q?=E5=B0=86=E6=96=B0=E5=A2=9E=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E6=A0=8F=E6=94=BE=E5=88=B0=E9=97=AE=E9=A2=98=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=8B=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll_form.html.erb | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index 598ef1207..1c2afc27c 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -60,6 +60,19 @@
 <body>
 <div class=" polls_content polls_edit" id="polls">
 
+  <!-- 头部 -->
+  <div id="polls_head_show">
+    <%= render :partial => 'show_head', :locals => {:poll => @poll}%>
+  </div>
+  <div id="polls_head_edit" style="display: none;">
+    <%= 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 "  >
@@ -86,19 +99,6 @@
     <div class="cl"></div>
   </div><!--选项 end-->
 
-  <!-- 头部 -->
-  <div id="polls_head_show">
-    <%= render :partial => 'show_head', :locals => {:poll => @poll}%>
-  </div>
-  <div id="polls_head_edit" style="display: none;">
-    <%= render :partial => 'edit_head', :locals => {:poll => @poll}%>
-  </div>
-
-  <!-- 问题 -->
-  <div id="poll_content">
-    <%= render :partial => 'poll_content', :locals => {:poll => @poll}%>
-  </div>
-
   <!-- 新增问题 -->
   <div id="new_poll_question">
   </div>

From 2954bba4117c7d852a1e7a5f88b7db51f01fb07e Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 16 Jan 2015 13:54:06 +0800
Subject: [PATCH 062/142] =?UTF-8?q?j=E8=BF=9B=E5=85=A5=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=A4=B4=E6=98=BE=E7=A4=BA=E4=B8=BA=E5=8F=AF?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll_form.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index 1c2afc27c..1b30c973d 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -61,10 +61,10 @@
 <div class=" polls_content polls_edit" id="polls">
 
   <!-- 头部 -->
-  <div id="polls_head_show">
+  <div id="polls_head_show"  style="display: none;">
     <%= render :partial => 'show_head', :locals => {:poll => @poll}%>
   </div>
-  <div id="polls_head_edit" style="display: none;">
+  <div id="polls_head_edit">
     <%= render :partial => 'edit_head', :locals => {:poll => @poll}%>
   </div>
 

From dedb70c56bafa3c9c00c98c41bc2f15edb4ceeb2 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 16 Jan 2015 14:03:12 +0800
Subject: [PATCH 063/142] =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=A4=9A=E9=80=89=E3=80=81=E5=8D=95=E8=A1=8C?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E3=80=81=E5=A4=9A=E8=A1=8C=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll_content.html.erb | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/views/poll/_poll_content.html.erb b/app/views/poll/_poll_content.html.erb
index 6c2e61215..40c9a6181 100644
--- a/app/views/poll/_poll_content.html.erb
+++ b/app/views/poll/_poll_content.html.erb
@@ -1,10 +1,26 @@
 <% poll.poll_questions.each do |poll_question|%>
     <div id="poll_questions_<%= poll_question.id%>">
       <div id="show_poll_questions_<%= poll_question.id %>">
-        <%= render :partial => 'show_MC', :locals => {:poll_question => poll_question} %>
+        <% 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;">
-        <%= render :partial => 'edit_MC', :locals => {:poll_question => poll_question} %>
+        <% 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 %>
\ No newline at end of file

From 164c89d7b8122baa73e086c709465574d22f043e Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 16 Jan 2015 14:39:40 +0800
Subject: [PATCH 064/142] =?UTF-8?q?1.=E5=AE=9E=E7=8E=B0=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89=E9=A2=98=202.=E5=8D=95=E9=80=89=E9=A2=98?=
 =?UTF-8?q?=E3=80=81=E5=A4=9A=E9=80=89=E9=A2=98=E5=90=8E=E9=9D=A2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=8B=AC=E5=8F=B7=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_edit_MCQ.html.erb          | 41 +++++++++----------
 app/views/poll/_new_MC.html.erb            |  6 +--
 app/views/poll/_new_MCQ.html.erb           | 46 +++++++++++++---------
 app/views/poll/_show_MC.html.erb           |  2 +-
 app/views/poll/_show_MCQ.html.erb          | 39 +++++++++---------
 app/views/poll/create_poll_question.js.erb | 16 ++++++++
 6 files changed, 85 insertions(+), 65 deletions(-)

diff --git a/app/views/poll/_edit_MCQ.html.erb b/app/views/poll/_edit_MCQ.html.erb
index cf64e7f3e..f34319569 100644
--- a/app/views/poll/_edit_MCQ.html.erb
+++ b/app/views/poll/_edit_MCQ.html.erb
@@ -1,33 +1,28 @@
-<div><!--编辑多选start-->
+<%= form_for("",:url => update_poll_question_poll_index_path(:poll_question => poll_question.id),:remote => true) do |f|%><!--编辑多选start-->
   <div class="ur_editor checkbox">
     <div class="ur_editor_title">
-      <label >问题：&nbsp;&nbsp;</label>
-      <input class="ur_question_title" type="text" name="title" placeholder="请输入多选题题标题"/>
-      <input type="checkbox" name="required" value="true" checked=""/>
-      <label >必答</label>
+      <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
+      <input 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" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
+      <label>必答</label>
     </div>
     <div class="ur_editor_content">
       <ul>
-        <li class="ur_item">
-          <label>选项 <span class="ur_index">01</span>： </label>
-          <input type="text" name="option" placeholder="新建选项"/>
-          <a class="icon_add" title="向下插入选项"></a>
-          <a class="icon_remove"  title="删除"></a>
-        </li>
-        <div class="cl"></div>
-        <li class="ur_item">
-          <label >选项 <span class="ur_index">01</span>： </label>
-          <input type="text" name="option" placeholder="新建选项"/>
-          <a class="icon_add" title="向下插入选项"></a>
-          <a class="icon_remove"  title="删除"></a>
-        </li>
-        <div class="cl"></div>
+        <% 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' 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">确定</a>
-      <a class="btn btn_light btn_cancel" data-button="cancel">取消</a>
+      <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="pollQuestionCancel(<%= poll_question.id%>);">取消</a>
     </div>
     <div class="cl"></div>
-  </div>
-</div><!--编辑多选 end-->
\ No newline at end of file
+  </div><!--编辑多选 end-->
+<% end%>
\ No newline at end of file
diff --git a/app/views/poll/_new_MC.html.erb b/app/views/poll/_new_MC.html.erb
index 013bf0ed0..f4f1ef676 100644
--- a/app/views/poll/_new_MC.html.erb
+++ b/app/views/poll/_new_MC.html.erb
@@ -1,6 +1,5 @@
 <%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%>
-  <div>
-    <!--编辑单选start-->
+    <!--新建单选start-->
     <div class="ur_editor radio">
       <div class="ur_editor_title">
         <label>问题：&nbsp;&nbsp;</label>
@@ -35,11 +34,10 @@
         </ul>
       </div>
       <div class="ur_editor_footer">
-        <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().parent().submit();">确定</a>
+        <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().parent().remove();">取消</a>
       </div>
       <div class="cl"></div>
     </div>
     <!--编辑单选 end-->
-  </div>
 <% end%>
\ No newline at end of file
diff --git a/app/views/poll/_new_MCQ.html.erb b/app/views/poll/_new_MCQ.html.erb
index 6739c233e..23f216427 100644
--- a/app/views/poll/_new_MCQ.html.erb
+++ b/app/views/poll/_new_MCQ.html.erb
@@ -1,33 +1,41 @@
-<div><!--编辑多选start-->
+<%= 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>
+      <label>问题：&nbsp;&nbsp;</label>
+      <input type="hidden" name="question_type" value="2"/>
       <input class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title" placeholder="请输入多选题题标题"/>
-      <input type="checkbox" name="required" value="true" checked=""/>
-      <label >必答</label>
+      <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">01</span>： </label>
-          <input type="text" name="option" placeholder="新建选项"/>
-          <a class="icon_add" title="向下插入选项"></a>
-          <a class="icon_remove"  title="删除"></a>
+        <li class='ur_item'>
+          <label>选项<span class='ur_index'></span>：</label>
+          <input 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">01</span>： </label>
-          <input type="text" name="option" placeholder="新建选项"/>
-          <a class="icon_add" title="向下插入选项"></a>
-          <a class="icon_remove"  title="删除"></a>
+        <div class='cl'></div>
+        <li class='ur_item'>
+          <label>选项<span class='ur_index'></span>：</label>
+          <input 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>
+        <div class='cl'></div>
+        <li class='ur_item'>
+          <label>选项<span class='ur_index'></span>：</label>
+          <input 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">确定</a>
-      <a class="btn btn_light btn_cancel" data-button="cancel">取消</a>
+      <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().parent().remove();">取消</a>
     </div>
     <div class="cl"></div>
   </div>
-</div><!--编辑多选 end-->
\ No newline at end of file
+<% end%><!--编辑多选 end-->
\ No newline at end of file
diff --git a/app/views/poll/_show_MC.html.erb b/app/views/poll/_show_MC.html.erb
index f3fc9c8b5..594baea9d 100644
--- a/app/views/poll/_show_MC.html.erb
+++ b/app/views/poll/_show_MC.html.erb
@@ -7,7 +7,7 @@
     <%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")  %>
diff --git a/app/views/poll/_show_MCQ.html.erb b/app/views/poll/_show_MCQ.html.erb
index e56de53b9..64e39523a 100644
--- a/app/views/poll/_show_MCQ.html.erb
+++ b/app/views/poll/_show_MCQ.html.erb
@@ -1,28 +1,31 @@
 <div  class="ur_question_item checkbox ur_editor02">
   <div class="ur_title">
-    <span class="title_index">第2题：</span> 多选题  <span class="ur_required" title="必答">*</span>
+    <span class="title_index">
+      第<%= poll_question.question_number%>题：
+    </span>
+    <%= poll_question.question_title %>
+    <%if poll_question.is_necessary == 1%>
+        <span class="ur_required" title="必答">*</span>
+    <%end%>
+    (多选题)
   </div>
-  <a href="#" class="ur_icon_de" title="删除"></a>
-  <a href="#" class="ur_icon_edit" title="编辑"></a>
+  <%= 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>
-      <tr>
-        <td>
-          <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
-        </td>
-      </tr>
-      <tr >
-        <td>
-          <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
-        </td>
-      </tr>
-      <tr>
-        <td>
-          <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
-        </td>
-      </tr>
+      <% 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>
diff --git a/app/views/poll/create_poll_question.js.erb b/app/views/poll/create_poll_question.js.erb
index 18f999157..ac44ebb4c 100644
--- a/app/views/poll/create_poll_question.js.erb
+++ b/app/views/poll/create_poll_question.js.erb
@@ -1,10 +1,26 @@
 $("#new_poll_question").html("");
 $("#poll_content").append("<div id='poll_questions_<%= @poll_questions.id%>'>" +
         "<div id='show_poll_questions_<%= @poll_questions.id %>'>" +
+        "<% if @poll_questions.question_type == 1%>" +
             "<%= escape_javascript(render :partial => 'show_MC', :locals => {:poll_question => @poll_questions}) %>" +
+        "<% elsif @poll_questions.question_type == 2%>" +
+            "<%= escape_javascript(render :partial => 'show_MCQ', :locals => {:poll_question => @poll_questions}) %>" +
+        "<% elsif @poll_questions.question_type == 3%>" +
+            "<%= escape_javascript(render :partial => 'show_single', :locals => {:poll_question => @poll_questions}) %>" +
+        "<% elsif @poll_questions.question_type == 4%>" +
+            "<%= escape_javascript(render :partial => 'show_mulit', :locals => {:poll_question => @poll_questions}) %>" +
+        "<% end%>" +
         "</div>" +
         "<div id='edit_poll_questions_<%= @poll_questions.id %>' style='display: none;'>" +
+        "<% if @poll_questions.question_type == 1%>" +
             "<%= escape_javascript(render :partial => 'edit_MC', :locals => {:poll_question => @poll_questions}) %>" +
+        "<% elsif @poll_questions.question_type == 2%>" +
+            "<%= escape_javascript(render :partial => 'edit_MCQ', :locals => {:poll_question => @poll_questions}) %>" +
+        "<% elsif @poll_questions.question_type == 3%>" +
+            "<%= escape_javascript(render :partial => 'edit_single', :locals => {:poll_question => @poll_questions}) %>" +
+        "<% elsif @poll_questions.question_type == 4%>" +
+            "<%= escape_javascript(render :partial => 'edit_mulit', :locals => {:poll_question => @poll_questions}) %>" +
+        "<% end%>" +
         "</div>" +
     "</div>");
 

From f46c8e8adc8cdd6c626667f538249520a168d9e4 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 16 Jan 2015 14:47:09 +0800
Subject: [PATCH 065/142] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E3=80=81=E5=A4=9A=E9=80=89=E5=8F=96=E6=B6=88=E4=B9=8B=E5=90=8E?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=BB=A7=E7=BB=AD=E6=96=B0=E5=BB=BA=E7=9A=84?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_new_MC.html.erb  | 2 +-
 app/views/poll/_new_MCQ.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/poll/_new_MC.html.erb b/app/views/poll/_new_MC.html.erb
index f4f1ef676..5ff70e9eb 100644
--- a/app/views/poll/_new_MC.html.erb
+++ b/app/views/poll/_new_MC.html.erb
@@ -35,7 +35,7 @@
       </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().parent().remove();">取消</a>
+        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">取消</a>
       </div>
       <div class="cl"></div>
     </div>
diff --git a/app/views/poll/_new_MCQ.html.erb b/app/views/poll/_new_MCQ.html.erb
index 23f216427..d94964bbf 100644
--- a/app/views/poll/_new_MCQ.html.erb
+++ b/app/views/poll/_new_MCQ.html.erb
@@ -34,7 +34,7 @@
     </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().parent().remove();">取消</a>
+      <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">取消</a>
     </div>
     <div class="cl"></div>
   </div>

From 65a3ddce41b921f5f3b0ec13867db4f451aad6d1 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 16 Jan 2015 15:05:30 +0800
Subject: [PATCH 066/142] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8D=95=E8=A1=8C=E6=96=87=E5=AD=97=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=202=E3=80=81=E4=BF=AE=E6=94=B9=E9=A2=98=E7=9B=AE=E5=90=8E?=
 =?UTF-8?q?=E6=80=BB=E6=98=AF=E6=98=BE=E7=A4=BA=E4=B8=BA=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb         |  3 +--
 app/views/poll/_edit_single.html.erb       | 14 +++++++----
 app/views/poll/_new_single.html.erb        | 29 ++++++++++++----------
 app/views/poll/_show_single.html.erb       | 14 ++++++++---
 app/views/poll/update_poll_question.js.erb | 20 +++++++++++++--
 5 files changed, 55 insertions(+), 25 deletions(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 9c5f810c6..fc23166ff 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -119,8 +119,7 @@ class PollController < ApplicationController
   #修改单选题
   def update_poll_question
     @poll_question = PollQuestion.find params[:poll_question]
-    @poll = @poll_question.poll
-
+    #@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]
     ################处理选项
diff --git a/app/views/poll/_edit_single.html.erb b/app/views/poll/_edit_single.html.erb
index 4e98babe4..b8157ee6c 100644
--- a/app/views/poll/_edit_single.html.erb
+++ b/app/views/poll/_edit_single.html.erb
@@ -1,13 +1,17 @@
+<%= form_for("",:url => update_poll_question_poll_index_path(:poll_question => poll_question.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 id="ur_question_title_1" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入单行文字标题"/>
-    <input type="checkbox" name="required" value="true" id="ur_question_require_2" checked=""/>
+    <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
+    <input 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" 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">确定</a>
-    <a class="btn_cancel" data-button="cancel">取消</a>
+    <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
+    <a class="btn_cancel" data-button="cancel" onclick="pollQuestionCancel(<%= poll_question.id%>);">取消</a>
   </div>
   <div class="cl"></div>
-</div><!--编辑单行文字end-->
\ No newline at end of file
+</div><!--编辑单行文字end-->
+<% end%>
\ No newline at end of file
diff --git a/app/views/poll/_new_single.html.erb b/app/views/poll/_new_single.html.erb
index b7d5a9725..ec06933a8 100644
--- a/app/views/poll/_new_single.html.erb
+++ b/app/views/poll/_new_single.html.erb
@@ -1,13 +1,16 @@
-<div class="ur_editor text "> <!--编辑单行文字start-->
-  <div class="ur_editor_title">
-    <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
-    <input id="poll_questions_title" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入单行文字标题"/>
-    <input type="checkbox" name="required" value="true" id="ur_question_require_2" checked=""/>
-    <label for="ur_question_require">必答</label>
-  </div>
-  <div class="ur_editor_footer">
-    <a class="btn_submit" data-button="ok">确定</a>
-    <a class="btn_cancel" data-button="cancel">取消</a>
-  </div>
-  <div class="cl"></div>
-</div><!--编辑单行文字end-->
\ No newline at end of file
+<%= 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 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%>
\ No newline at end of file
diff --git a/app/views/poll/_show_single.html.erb b/app/views/poll/_show_single.html.erb
index 437e38044..d9ef2abc7 100644
--- a/app/views/poll/_show_single.html.erb
+++ b/app/views/poll/_show_single.html.erb
@@ -1,9 +1,17 @@
 <div  class="ur_question_item text ur_editor02 ">
   <div class="ur_title">
-    <span class="title_index">第3题：</span> 单行文字
+    <span class="title_index">
+      第<%= poll_question.question_number%>题：
+    </span>
+    <%= poll_question.question_title %>
+    <%if poll_question.is_necessary == 1%>
+        <span class="ur_required" title="必答">*</span>
+    <%end%>
+    (单行文字)
   </div>
-  <a href="#" class="ur_icon_de" title="删除"></a>
-  <a href="#" class="ur_icon_edit" title="编辑"></a>
+  <%= 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="">
diff --git a/app/views/poll/update_poll_question.js.erb b/app/views/poll/update_poll_question.js.erb
index 39d0fcfd6..e0727df67 100644
--- a/app/views/poll/update_poll_question.js.erb
+++ b/app/views/poll/update_poll_question.js.erb
@@ -1,6 +1,22 @@
 $("#poll_questions_<%= @poll_question.id%>").html("<div id='show_poll_questions_<%= @poll_question.id %>'>" +
-        "<%= escape_javascript(render :partial => 'show_MC', :locals => {:poll_question => @poll_question}) %>" +
+        "<% if @poll_question.question_type == 1%>" +
+            "<%= escape_javascript(render :partial => 'show_MC', :locals => {:poll_question => @poll_question}) %>" +
+        "<% elsif @poll_question.question_type == 2%>" +
+            "<%= escape_javascript(render :partial => 'show_MCQ', :locals => {:poll_question => @poll_question}) %>" +
+        "<% elsif @poll_question.question_type == 3%>" +
+            "<%= escape_javascript(render :partial => 'show_single', :locals => {:poll_question => @poll_question}) %>" +
+        "<% elsif @poll_question.question_type == 4%>" +
+            "<%= escape_javascript(render :partial => 'show_mulit', :locals => {:poll_question => @poll_question}) %>" +
+        "<% end%>" +
    "</div>" +
    "<div id='edit_poll_questions_<%= @poll_question.id %>' style='display: none;'>" +
-        "<%= escape_javascript(render :partial => 'edit_MC', :locals => {:poll_question => @poll_question}) %>" +
+        "<% if @poll_question.question_type == 1%>" +
+            "<%= escape_javascript(render :partial => 'edit_MC', :locals => {:poll_question => @poll_question}) %>" +
+        "<% elsif @poll_question.question_type == 2%>" +
+            "<%= escape_javascript(render :partial => 'edit_MCQ', :locals => {:poll_question => @poll_question}) %>" +
+        "<% elsif @poll_question.question_type == 3%>" +
+            "<%= escape_javascript(render :partial => 'edit_single', :locals => {:poll_question => @poll_question}) %>" +
+        "<% elsif @poll_question.question_type == 4%>" +
+            "<%= escape_javascript(render :partial => 'edit_mulit', :locals => {:poll_question => @poll_question}) %>" +
+        "<% end%>" +
    "</div>");

From 0a367249ae3b7f3fb32072316c5324f55ed570e8 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 16 Jan 2015 15:32:09 +0800
Subject: [PATCH 067/142] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E5=BA=A6=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb    | 90 +++++++++++++++++++++------
 app/views/poll/_commit_alert.html.erb |  2 +-
 app/views/poll/show.html.erb          | 27 ++++++--
 3 files changed, 95 insertions(+), 24 deletions(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index a843e9d9b..8f89c1a9e 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -24,6 +24,7 @@ class PollController < ApplicationController
       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,3 #分页
       respond_to do |format|
@@ -172,7 +173,7 @@ class PollController < ApplicationController
   def commit_answer
     pq = PollQuestion.find(params[:poll_question_id])
     if has_commit_poll?(@poll.id,User.current.id) && (!User.current.admin?)
-      render :text => 'failure'
+      render :json => {:text => "failure"}
       return
     end
     if pq.question_type == 1
@@ -185,9 +186,10 @@ class PollController < ApplicationController
       end
       pv.poll_answer_id = params[:poll_answer_id]
       if pv.save
-        render :text => "ok"
+        @percent = get_percent(@poll,User.current)
+        render :json => {:text => "ok" ,:percent => format("%.2f" ,@percent)}
       else
-        render :text => "failure"
+        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)
@@ -197,38 +199,64 @@ class PollController < ApplicationController
         pv.poll_question_id = params[:poll_question_id]
         pv.poll_answer_id = params[:poll_answer_id]
         if pv.save
-          render :text => "true"
+          @percent = get_percent(@poll,User.current)
+          render :json => {:text => "true",:percent => format("%.2f" ,@percent)}
         else
-          render :text => "failure"
+          render :json => {:text => "failure"}
         end
       else
         if pv.delete
-          render :text => "false"
+          @percent = get_percent(@poll,User.current)
+          render :json => {:text => "false" ,:percent => format("%.2f" ,@percent)}
         else
-          render :text => "failure"
+          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 = PollVote.new
-        pv.user_id = User.current.id
-        pv.poll_question_id = params[:poll_question_id]
-      end
-      pv.vote_text = params[:vote_text]
-      if pv.save
-        render :text => pv.vote_text
+        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
-        render :text => "failure"
+        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 :text => "failure"
+      render :json => {:text => "failure"}
     end
   end
 
   #提交问卷
   def commit_poll
-    @uncomplete_question = get_uncomplete_question(@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
@@ -277,17 +305,41 @@ class PollController < ApplicationController
   end
 
   #获取未完成的题目
-  def get_uncomplete_question poll
+  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|
-      if question.poll_votes.nil? || question.poll_votes.count < 1
+      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
+    (complete_count.to_f / poll.poll_questions.count.to_f)*100
+  end
+
   #PollUser记录用户是否已提交问卷有对应的记录则已提交，没有则新建一个
   def get_poll_user poll_id,user_id
     pu = PollUser.find_by_poll_id_and_user_id(poll_id,user_id)
diff --git a/app/views/poll/_commit_alert.html.erb b/app/views/poll/_commit_alert.html.erb
index 76bbda416..3910bc8b5 100644
--- a/app/views/poll/_commit_alert.html.erb
+++ b/app/views/poll/_commit_alert.html.erb
@@ -3,7 +3,7 @@
     <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>
+    <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>
diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index 2db0045f6..42818dd34 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -72,7 +72,10 @@
                                               poll_question_id: <%= pq.id %>
                                           },
                                           success: function (data) {
-                                             obj.checked = true;
+                                            var dataObj = eval(data);
+                                            obj.checked = true;
+                                            var span = $('#percent');
+                                            span.html(dataObj.percent);
                                           }
                                       });
                                   }
@@ -118,7 +121,8 @@
                                                 poll_question_id: <%= pq.id %>
                                             },
                                             success: function (data) {
-                                                if(data == "true")
+                                                var dataObj = eval(data);
+                                                if(dataObj.text == "true")
                                                 {
                                                     obj.checked = true;
                                                 }
@@ -126,6 +130,8 @@
                                                 {
                                                     obj.checked = false;
                                                 }
+                                                var span = $('#percent');
+                                                span.html(dataObj.percent);
                                             }
                                         });
                                     }
@@ -165,6 +171,9 @@
                                   vote_text: obj.value
                               },
                               success: function (data) {
+                                  var dataObj = eval(data);
+                                  var span = $('#percent');
+                                  span.html(dataObj.percent);
 //                                 obj.value = data;
                               }
                           });
@@ -198,7 +207,17 @@
                                     vote_text: obj.innerHTML
                                 },
                                 success: function (data) {
-//                                 obj.value = data;
+                                    var dataObj = eval(data);
+                                    if(dataObj.text != 'failure')
+                                    {
+                                      var span = $('#percent');
+                                      span.html(dataObj.percent);
+                                    }
+                                    else
+                                    {
+                                        alert("error");
+                                    }
+
                                 }
                             });
                         }
@@ -222,7 +241,7 @@
       <% end %>
     </div>
     <div class="cl"></div>
-    <div class="ur_progress_text">答题已完成 <strong class="ur_progress_number">0%</strong> </div>
+    <div class="ur_progress_text">答题已完成 <strong class="ur_progress_number"><span id="percent"><%= format "%.2f" ,@percent %></span>%</strong> </div>
 
   </div>
 

From fe3a84c8db35c648478d900bd2c1faa9433f5af9 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 16 Jan 2015 15:34:25 +0800
Subject: [PATCH 068/142] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=A4=9A=E8=A1=8C=E6=96=87=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_edit_mulit.html.erb | 19 +++++++++++--------
 app/views/poll/_new_mulit.html.erb  | 21 ++++++++++++---------
 app/views/poll/_show_mulit.html.erb | 14 +++++++++++---
 3 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/app/views/poll/_edit_mulit.html.erb b/app/views/poll/_edit_mulit.html.erb
index c4a9e0e0f..684a285e3 100644
--- a/app/views/poll/_edit_mulit.html.erb
+++ b/app/views/poll/_edit_mulit.html.erb
@@ -1,18 +1,21 @@
+<%= form_for("",:url => update_poll_question_poll_index_path(:poll_question => poll_question.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 id="ur_question_title" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入多行文字标题"/>
-    <input type="checkbox" name="required" value="true" id="ur_question_require" checked=""/>
+    <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
+    <input 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" 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>
+    <!--<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">确定</a>
-    <a class="btn_cancel" data-button="cancel">取消</a>
+    <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-->
\ No newline at end of file
+</div><!--编辑多行文字end-->
+<% end%>
\ No newline at end of file
diff --git a/app/views/poll/_new_mulit.html.erb b/app/views/poll/_new_mulit.html.erb
index 6c3528473..e034e54af 100644
--- a/app/views/poll/_new_mulit.html.erb
+++ b/app/views/poll/_new_mulit.html.erb
@@ -1,18 +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 id="poll_questions_title" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title" placeholder="请输入多行文字标题"/>
-    <input type="checkbox" name="required" value="true" id="ur_question_require" checked=""/>
-    <label for="ur_question_require">必答</label>
+    <input type="hidden" name="question_type" value="4"/>
+    <input 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>
+    <!--<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">确定</a>
-    <a class="btn_cancel" data-button="cancel">取消</a>
+    <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-->
\ No newline at end of file
+</div><!--编辑多行文字end-->
+<% end%>
\ No newline at end of file
diff --git a/app/views/poll/_show_mulit.html.erb b/app/views/poll/_show_mulit.html.erb
index 35e37ef06..23bdbe6eb 100644
--- a/app/views/poll/_show_mulit.html.erb
+++ b/app/views/poll/_show_mulit.html.erb
@@ -1,10 +1,18 @@
 <div class="ur_question_item textarea ur_editor02">
   <div class="ur_preview">
     <div class="ur_title">
-      <span class="title_index">第4题：</span> 多行主观
+      <span class="title_index">
+        第<%= poll_question.question_number%>题：
+      </span>
+      <%= poll_question.question_title %>
+      <%if poll_question.is_necessary == 1%>
+          <span class="ur_required" title="必答">*</span>
+      <%end%>
+      (多行主观)
     </div>
-    <a href="#" class="ur_icon_de" title="删除"></a>
-    <a href="#" class="ur_icon_edit" title="编辑"></a>
+    <%= 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>

From 7177303eeb4899010db5af9c831b85504813970b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 16 Jan 2015 15:49:22 +0800
Subject: [PATCH 069/142] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=9C=80=E7=BB=88=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb        |  2 +-
 app/helpers/poll_helper.rb                | 18 ++++++++-
 app/views/poll/_choice_show.html.erb      | 49 ++++++++++++-----------
 app/views/poll/statistics_result.html.erb | 10 ++---
 config/locales/zh.yml                     |  5 +++
 5 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 3de4e8339..3b4bf3694 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -86,7 +86,7 @@ class PollController < ApplicationController
   def statistics_result
     @poll = Poll.find(params[:id])
     poll_questions = @poll.poll_questions 
-    @poll_questions = paginateHelper poll_questions,3 #分页
+    @poll_questions = paginateHelper poll_questions, 5
     respond_to do |format|
       format.html{render :layout => 'base_courses'}
     end
diff --git a/app/helpers/poll_helper.rb b/app/helpers/poll_helper.rb
index 7816d8e37..1a8fabae3 100644
--- a/app/helpers/poll_helper.rb
+++ b/app/helpers/poll_helper.rb
@@ -27,7 +27,7 @@ module PollHelper
       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)
@@ -47,4 +47,20 @@ module PollHelper
       true
     end
   end
+  
+  #统计答题百分比
+  def statistics_result_percentage(e, t)
+    return e*100/t 
+  end
+  
+  def options_show p
+    case p
+    when 1
+      "单选题"
+    when 2
+      "多选题"
+    else
+      "问答题"
+    end
+  end
 end
\ No newline at end of file
diff --git a/app/views/poll/_choice_show.html.erb b/app/views/poll/_choice_show.html.erb
index aa425e748..16971d5ad 100644
--- a/app/views/poll/_choice_show.html.erb
+++ b/app/views/poll/_choice_show.html.erb
@@ -1,25 +1,28 @@
-
 <div class="ur_table_result">
-        <table  border="0" cellspacing="0" cellpadding="0" >
-          <tbody>
-          <tr class="table_bluebg">
-            <td class="td327">选项 </td>
-            <td class="td42">小计 </td>
-            <td class="td287">比例 </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:75%;"></span></div> 75% </td>
-          </tr>
-          <% end %>
-          <tr class="table_bluebg">
-            <td class="td327">本题有效填写人次 </td>
-            <td class="td42"><%= poll_question.poll_votes.count %></td>
-            <td class="td287">&nbsp; </td>
-          </tr>
-          </tbody>
-        </table>
-      </div>
+  <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, @poll.users.count) %>%;" id="choice_percentage_<%= poll_answer.id %>"></span>
+    	  </div>
+          <%= statistics_result_percentage(poll_answer.poll_votes.count, @poll.users.count) %>%</td>
+      </tr>
+      <% end %>
+        <tr class="table_bluebg">
+          <td class="td327"><%= l(:label_poll_valid_commit) %> </td>
+          <td class="td42"><%= poll_question.poll_votes.count %></td>
+          <td class="td287">&nbsp; </td>
+        </tr>
+     </tbody>
+   </table>
+</div>
 
diff --git a/app/views/poll/statistics_result.html.erb b/app/views/poll/statistics_result.html.erb
index d6181fb1a..dea18f8d8 100644
--- a/app/views/poll/statistics_result.html.erb
+++ b/app/views/poll/statistics_result.html.erb
@@ -2,14 +2,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>问卷调查_问卷结果</title>
+  <title><%= l(:label_poll_result) %></title>
   <%= stylesheet_link_tag  'polls', :media => 'all' %>
 </head>
 
 <body>
 <div class="polls_content polls_box" id="polls">
 <div class="ur_page_head" >
-  <h1 class="ur_page_title">某问卷统计</h1>
+  <h1 class="ur_page_title"><%= @poll.polls_name %> <%= l(:label_poll) %></h1>
 </div>
 
 <% @poll_questions.each do |poll_question| %>
@@ -17,7 +17,8 @@
   <ol>
     <li class="ur_question_item">
       <div class="ur_title_result">
-        <span class="title_index">第<%= poll_question.question_number %>题：</span><%= poll_question.question_title %> <span class="title_index">[单选题]<% poll_question.poll_answers %></span>
+        <span class="title_index">第<%= poll_question.question_number %>题：</span><%= poll_question.question_title %> 
+        <span class="title_index">[<%= options_show(poll_question.question_type) %>]</span>
       </div>
       <%= render :partial =>'choice_show', :locals =>{ :poll_question => poll_question } %>
     </li>    
@@ -28,11 +29,8 @@
     </ul>
     <div class="cl"></div>
   <div class="ur_buttons">
-    <!--<a href="#" class=" ur_button"  >上一页</a>-->
-    <!--<a href="#" class="ur_button" >下一页</a>-->
   </div>
   <div class="cl"></div>
-  <div class="ur_progress_text">答题已完成 <strong class="ur_progress_number">0%</strong> </div> 
 </div>
 
 </div><!--问卷内容end-->
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 95ab07d5d..5c2925b90 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2253,5 +2253,10 @@ zh:
   label_new_answer: 新建选项
   label_poll_title: 问卷标题
   label_poll_description: 问卷描述
+  label_poll_options: 选项
+  label_poll_subtotal: 小计
+  label_poll_proportion: 比例
+  label_poll_valid_commit: 本题有效填写人次
+  label_poll_result: 问卷调查_问卷统计
 
 

From dd42c89ee6972d08237fe549dffe51503c4f279a Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 16 Jan 2015 15:51:26 +0800
Subject: [PATCH 070/142] =?UTF-8?q?=E7=99=BE=E5=88=86=E6=AF=94=E9=99=A4?=
 =?UTF-8?q?=E6=95=B0=E4=B8=BA0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index d77f7c872..221c482c7 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -178,20 +178,26 @@ class PollController < ApplicationController
       #单选题
       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]
@@ -203,6 +209,7 @@ class PollController < ApplicationController
           render :json => {:text => "failure"}
         end
       else
+        #pv不为空，则当前选项之前已被选择，再次点击则是不再选择该项，故删除该答案
         if pv.delete
           @percent = get_percent(@poll,User.current)
           render :json => {:text => "false" ,:percent => format("%.2f" ,@percent)}
@@ -211,12 +218,16 @@ class PollController < ApplicationController
         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]
@@ -229,7 +240,9 @@ class PollController < ApplicationController
           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)}
@@ -237,6 +250,7 @@ class PollController < ApplicationController
             render :json => {:text => "failure"}
           end
         else
+          #用户修改答案
           pv.vote_text = params[:vote_text]
           if pv.save
             @percent = get_percent(@poll,User.current)
@@ -335,7 +349,11 @@ class PollController < ApplicationController
 
   def get_percent poll,user
     complete_count = get_complete_question(poll,user).count
-    (complete_count.to_f / poll.poll_questions.count.to_f)*100
+    if poll.poll_questions.count == 0
+      return 0
+    else
+      return (complete_count.to_f / poll.poll_questions.count.to_f)*100
+    end
   end
 
   #PollUser记录用户是否已提交问卷有对应的记录则已提交，没有则新建一个

From 79ad33a90f40ed65569d337c9c5f3fc876da12a6 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 16 Jan 2015 15:57:49 +0800
Subject: [PATCH 071/142] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E7=9A=84=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb | 11 ++++++++---
 config/routes.rb                   |  1 +
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 28c44f0cb..2e7d95478 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -90,7 +90,7 @@ class PollController < ApplicationController
     end
   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 = {
@@ -117,7 +117,7 @@ class PollController < ApplicationController
     end
   end
 
-  #修改单选题
+  #修改题目
   def update_poll_question
     @poll_question = PollQuestion.find params[:poll_question]
     #@poll = @poll_question.poll
@@ -150,7 +150,7 @@ class PollController < ApplicationController
     end
   end
 
-  #删除单选题
+  #删除题目
   def delete_poll_question
     @poll_question = PollQuestion.find params[:poll_question]
     @poll = @poll_question.poll
@@ -166,6 +166,11 @@ class PollController < ApplicationController
     end
   end
 
+  #发布问卷
+  def publish_poll
+
+  end
+
   #提交答案
   def commit_answer
     pq = PollQuestion.find(params[:poll_question_id])
diff --git a/config/routes.rb b/config/routes.rb
index dc8205e2d..bd1b27dee 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -64,6 +64,7 @@ RedmineApp::Application.routes.draw do
       post 'commit_answer'
       post 'create_poll_question'
       post 'commit_poll'
+      get 'publish_poll'
     end
     collection do
       delete 'delete_poll_question'

From bbf4c4629b69a93d70847fd76d5e0edffa6d28e3 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 16 Jan 2015 16:13:03 +0800
Subject: [PATCH 072/142] =?UTF-8?q?=E9=97=AE=E5=8D=B7show=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/show.html.erb | 22 +++++++++++-----------
 config/locales/en.yml        |  6 ++++--
 config/locales/zh.yml        |  4 ++++
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index 42818dd34..c1ac5d377 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>问卷调查_问卷页面</title>
+  <title><%= l(:label_poll_title) %></title>
   <%= stylesheet_link_tag  'polls', :media => 'all' %>
   <style type="text/css">
     .alert_box{width:480px;height:180px;position:fixed;z-index:100;left:55%;top:50%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
@@ -46,10 +46,10 @@
           <!-- 单选题 -->
               <li class="ur_question_item radio">
                 <div class="ur_title">
-                  <span class="title_index">第<%= pq.question_number %>题：</span>
+                  <span class="title_index"><%= l(:label_question_number,:question_number => pq.question_number) %></span>
                   <%= pq.question_title %>
                   <% if pq.is_necessary == 1 %>
-                    <span class="ur_required" title="必答">*</span>
+                    <span class="ur_required" title="<%= l(:label_must_answer) %>">*</span>
                   <% end %>
                 </div>
                 <div class="cl"></div>
@@ -95,10 +95,10 @@
           <!-- 多选题 -->
               <li class="ur_question_item checkbox">
                 <div class="ur_title">
-                  <span class="title_index">第<%= pq.question_number %>题：</span>
+                  <span class="title_index"><%= l(:label_question_number,:question_number => pq.question_number) %></span>
                   <%= pq.question_title %>
                   <% if pq.is_necessary == 1 %>
-                      <span class="ur_required" title="必答">*</span>
+                      <span class="ur_required" title="<%= l(:label_must_answer) %>">*</span>
                   <% end %>
                 </div>
                 <div class="cl"></div>
@@ -151,10 +151,10 @@
           <!-- 单行文字-->
               <li  class="ur_question_item text">
                 <div class="ur_title">
-                  <span class="title_index">第<%= pq.question_number %>题：</span>
+                  <span class="title_index"><%= l(:label_question_number,:question_number => pq.question_number) %></span>
                   <%= pq.question_title %>
                   <% if pq.is_necessary == 1 %>
-                      <span class="ur_required" title="必答">*</span>
+                      <span class="ur_required" title="<%= l(:label_must_answer) %>">*</span>
                   <% end %>
                 </div>
                 <div class="cl"></div>
@@ -188,10 +188,10 @@
               <li class="ur_question_item textarea">
                 <div class="ur_preview">
                   <div class="ur_title">
-                    <span class="title_index">第<%= pq.question_number %>题：</span>
+                    <span class="title_index"><%= l(:label_question_number,:question_number => pq.question_number) %></span>
                     <%= pq.question_title %>
                     <% if pq.is_necessary == 1 %>
-                        <span class="ur_required" title="必答">*</span>
+                        <span class="ur_required" title="<%= l(:label_must_answer) %>">*</span>
                     <% end %>
                   </div>
                   <div class="cl"></div>
@@ -237,11 +237,11 @@
     <div class="cl"></div>
     <div class="ur_buttons" style="width: 100px;">
       <% if @poll.polls_status == 2 %>
-        <%= link_to "提交",commit_poll_poll_path(@poll), :method => :post,:class => "ur_button",:format => 'js',:remote=>true %>
+        <%= link_to l(:button_submit),commit_poll_poll_path(@poll), :method => :post,:class => "ur_button",:format => 'js',:remote=>true %>
       <% end %>
     </div>
     <div class="cl"></div>
-    <div class="ur_progress_text">答题已完成 <strong class="ur_progress_number"><span id="percent"><%= format "%.2f" ,@percent %></span>%</strong> </div>
+    <div class="ur_progress_text"><%= l(:label_complete_question) %> <strong class="ur_progress_number"><span id="percent"><%= format "%.2f" ,@percent %></span>%</strong> </div>
 
   </div>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 22b0df023..dd79a546c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1817,8 +1817,10 @@ en:
   label_record: 湘ICP备09019772
   label_check_comment: Check comment
   label_notification: Notification
-
-
+  label_must_answer: Will answer
+  label_poll_title: The questionnaire survey _ questionnaire page
+  label_question_number: 'question %{question_number}:'
+  label_complete_question: The answer has been completed
 #end
 
   # ajax异步验证
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 5c2925b90..6ef58cce5 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -964,6 +964,8 @@ zh:
   label_default: 默认
   label_search_titles_only: 仅在标题中搜索
   label_user_mail_option_all: "收取我的项目的所有通知"
+  label_must_answer: "必答"
+  label_poll_title: 问卷调查_问卷页面
   #huang
   label_file_new: 下载
   label_user_edit: "修改资料"
@@ -1419,6 +1421,8 @@ zh:
     other: 参与了 %{count} 个项目：
   #end
   label_total_commit: 共%{total_commit}次提交
+  label_question_number: 第%{question_number}题：
+  label_complete_question: 答题已完成
   #modify by men
   label_x_total_commit: 
     zero: 共 %{count} 次提交

From 59c21d81e9c3244e86555740939be3ce78ad150a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 16 Jan 2015 16:48:20 +0800
Subject: [PATCH 073/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=88=86?=
 =?UTF-8?q?=E6=AF=8D=E4=B8=8D=E8=83=BD=E4=B8=BA0=E7=9A=84bug=20=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E7=BB=93=E6=9E=9C=E7=B2=BE=E7=A1=AE=E5=88=B0=E4=B8=A4?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/poll_helper.rb                |  4 +-
 app/views/poll/statistics_result.html.erb | 65 +++++++++++------------
 2 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/app/helpers/poll_helper.rb b/app/helpers/poll_helper.rb
index 1a8fabae3..55418faf2 100644
--- a/app/helpers/poll_helper.rb
+++ b/app/helpers/poll_helper.rb
@@ -50,7 +50,9 @@ module PollHelper
   
   #统计答题百分比
   def statistics_result_percentage(e, t)
-    return e*100/t 
+    e = e.to_f
+    t = t.to_f
+    t == 0 ? 0 : format("%.2f", e*100/t)
   end
   
   def options_show p
diff --git a/app/views/poll/statistics_result.html.erb b/app/views/poll/statistics_result.html.erb
index dea18f8d8..057314a9c 100644
--- a/app/views/poll/statistics_result.html.erb
+++ b/app/views/poll/statistics_result.html.erb
@@ -1,38 +1,33 @@
 <!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><%= l(:label_poll_result) %></title>
-  <%= stylesheet_link_tag  'polls', :media => 'all' %>
-</head>
-
-<body>
-<div class="polls_content polls_box" id="polls">
-<div class="ur_page_head" >
-  <h1 class="ur_page_title"><%= @poll.polls_name %> <%= l(:label_poll) %></h1>
-</div>
-
-<% @poll_questions.each do |poll_question| %>
-<div class="">
-  <ol>
-    <li class="ur_question_item">
-      <div class="ur_title_result">
-        <span class="title_index">第<%= poll_question.question_number %>题：</span><%= poll_question.question_title %> 
-        <span class="title_index">[<%= options_show(poll_question.question_type) %>]</span>
-      </div>
-      <%= render :partial =>'choice_show', :locals =>{ :poll_question => poll_question } %>
-    </li>    
-  </ol>
-  <% end %>
-   <ul class="wlist">
-      <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-    </ul>
-    <div class="cl"></div>
-  <div class="ur_buttons">
-  </div>
-  <div class="cl"></div>
-</div>
-
-</div><!--问卷内容end-->
-</body>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+      <title><%= l(:label_poll_result) %></title>
+		<%= stylesheet_link_tag  'polls', :media => 'all' %>
+  </head>
+  <body>
+    <div class="polls_content polls_box" id="polls">
+	  <div class="ur_page_head" >
+		<h1 class="ur_page_title"><%= @poll.polls_name %> <%= l(:label_poll) %></h1>
+	  </div> 
+      <% @poll_questions.each do |poll_question| %>
+	  <div class="">
+	    <ol>
+		  <li class="ur_question_item">
+		    <div class="ur_title_result">
+			  <span class="title_index">第<%= poll_question.question_number %>题：</span><%= poll_question.question_title %> <span class="title_index">[<%= options_show(poll_question.question_type) %>]</span>
+			</div>
+			  <%= render :partial =>'choice_show', :locals =>{ :poll_question => poll_question } %>
+		  </li>
+		</ol>
+	  <% end %>
+	    <ul class="wlist">
+		  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+		</ul>
+		  <div class="cl"></div>
+		  <div class="ur_buttons"></div>
+		  <div class="cl"></div>
+		  </div>
+    </div>
+  </body>
 </html>

From ae9856c01a1c42d71c3507f27d8ced7707c039ec Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 16 Jan 2015 17:21:33 +0800
Subject: [PATCH 074/142] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=97=B6=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E6=A1=86js=E3=80=81css=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb   | 10 +++--
 app/views/poll/_poll_form.html.erb   | 14 ++++++-
 app/views/poll/_poll_submit.html.erb | 63 ++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 4 deletions(-)
 create mode 100644 app/views/poll/_poll_submit.html.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index cbd8fb12d..6a4ba0cc5 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -1,8 +1,8 @@
 class PollController < ApplicationController
-  before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll,:commit_answer]
+  before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll,:commit_answer,:publish_poll]
   before_filter :find_container, :only => [:new,:create, :index]
   before_filter :is_member_of_course, :only => [:index,:show]
-  before_filter :is_course_teacher, :only => [:new,:create,:edit,:update,:destroy]
+  before_filter :is_course_teacher, :only => [:new,:create,:edit,:update,:destroy,:publish_poll]
   include PollHelper
   def index
     if @course
@@ -180,7 +180,11 @@ class PollController < ApplicationController
 
   #发布问卷
   def publish_poll
-
+    @poll.polls_status = 2
+    @poll.published_at = Time.now
+    if @poll.save
+      redirect_to poll_index_url(:polls_type => "Course", :polls_group_id => @course.id)
+    end
   end
 
   #提交答案
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index 1b30c973d..849ae7774 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -54,6 +54,18 @@
               doc.parent().remove();
           }
       }
+
+      function poll_submit()
+      {
+          $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { poll: @poll}) %>');
+          showModal('ajax-modal', '500px');
+          $('#ajax-modal').css('height','180px');
+          $('#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().css("top","").css("left","");
+          $('#ajax-modal').parent().addClass("anonymos");
+      }
   </script>
 </head>
 
@@ -104,7 +116,7 @@
   </div>
 
   <div class="ur_buttons">
-    <a href="#" class="ur_button_submit" >
+    <a class="ur_button_submit" onclick="poll_submit();">
       <%= l(:label_memo_create)%>
     </a>
   </div>
diff --git a/app/views/poll/_poll_submit.html.erb b/app/views/poll/_poll_submit.html.erb
new file mode 100644
index 000000000..0f9e96b73
--- /dev/null
+++ b/app/views/poll/_poll_submit.html.erb
@@ -0,0 +1,63 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>开启匿评功能</title>
+  <style>
+      #popbox02{ font-size:12px; font-family:"微软雅黑","宋体"; background:#fff; font-style:normal;}
+      #popbox02 div,img,tr,td,textarea{ border:0;}
+      #popbox02 table,tr,td{border:0; cellspacing:0; cellpadding:0;}
+      #popbox02 ul,li{ list-style-type:none}
+      #popbox02 .cl{ clear:both; overflow:hidden; }
+      #popbox02 a{ text-decoration:none; }
+      #popbox02 a:hover{ text-decoration:underline;}
+      /* 问卷发布弹框 */
+      .anonymos{width:480px;height:180px;position:fixed;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
+      .ni_con { width:425px; margin:25px 30px;}
+      .ni_con h2{ display:block; height:40px; width:425px;   text-align:center; color:#3a3a3a;}
+      .ni_con p{ color:#808181; }
+      .ni_con a:hover{ text-decoration:none;}
+      .ni_btn{ width:190px; margin:15px auto;  line-height:1.9;}
+      a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:15px;}
+      a:hover.tijiao{ background:#0f99a9;}
+      .c_blue{ color:#0195bd;}
+      .c_pink{ color:#e65d5e;}
+  </style>
+
+  <script type="text/javascript">
+      function clickPublishPoll()
+      {
+          hideModal("#popbox02");
+          $.ajax({
+              type: "GET",
+              url: "<%= publish_poll_poll_path(poll.id)%>",
+              data: 'text',
+              success: function (data) {
+
+              }
+          });
+      }
+      function clickCanel(){hideModal("#popbox02");}
+  </script>
+</head>
+
+<body>
+<div id="popbox02">
+  <div class="ni_con">
+    <h2>问卷发布</h2>
+    <p style="text-align: center">
+      问卷发布后将无法
+      <span class="c_blue">修改</span>
+      <br/>
+      是否确定发布该问卷？
+    </p>
+    <div class="ni_btn">
+      <%= link_to "确    定",publish_poll_poll_path(poll.id), :class => "tijiao", :onclick => "clickCanel();" %>
+      <a href="#" class="tijiao" onclick="clickCanel();">
+        取&nbsp;&nbsp;消
+      </a>
+    </div>
+  </div>
+</div>
+</body>
+</html>
+

From d16d5fd362179d62fde4efebf24bd8f9cb91f8b3 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 16 Jan 2015 17:31:04 +0800
Subject: [PATCH 075/142] =?UTF-8?q?=E5=8D=95=E8=A1=8C=E6=96=87=E5=AD=97/?=
 =?UTF-8?q?=E5=A4=9A=E8=A1=8C=E6=96=87=E5=AD=97=20-->=20=E5=8D=95=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=BB=E8=A7=82/=E5=A4=9A=E8=A1=8C=E4=B8=BB=E8=A7=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_edit_mulit.html.erb  | 2 +-
 app/views/poll/_edit_single.html.erb | 2 +-
 app/views/poll/_new_mulit.html.erb   | 2 +-
 app/views/poll/_new_single.html.erb  | 2 +-
 app/views/poll/_show_single.html.erb | 2 +-
 config/locales/zh.yml                | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/poll/_edit_mulit.html.erb b/app/views/poll/_edit_mulit.html.erb
index 684a285e3..f4e079c17 100644
--- a/app/views/poll/_edit_mulit.html.erb
+++ b/app/views/poll/_edit_mulit.html.erb
@@ -3,7 +3,7 @@
   <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 class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入多行文字标题" value="<%= poll_question.question_title%>"/>
+    <input 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" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
     <label for="ur_question_require">必答</label>
   </div>
diff --git a/app/views/poll/_edit_single.html.erb b/app/views/poll/_edit_single.html.erb
index b8157ee6c..b172d955c 100644
--- a/app/views/poll/_edit_single.html.erb
+++ b/app/views/poll/_edit_single.html.erb
@@ -4,7 +4,7 @@
     <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
     <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
     <input 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%>"/>
+           name="poll_questions_title"  placeholder="请输入单行主观标题" value="<%= poll_question.question_title%>"/>
     <input type="checkbox" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
     <label for="ur_question_require">必答</label>
   </div>
diff --git a/app/views/poll/_new_mulit.html.erb b/app/views/poll/_new_mulit.html.erb
index e034e54af..155f208c4 100644
--- a/app/views/poll/_new_mulit.html.erb
+++ b/app/views/poll/_new_mulit.html.erb
@@ -3,7 +3,7 @@
   <div class="ur_editor_title">
     <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
     <input type="hidden" name="question_type" value="4"/>
-    <input id="poll_questions_title" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入多行文字标题"/>
+    <input 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>
diff --git a/app/views/poll/_new_single.html.erb b/app/views/poll/_new_single.html.erb
index ec06933a8..fb052a7a3 100644
--- a/app/views/poll/_new_single.html.erb
+++ b/app/views/poll/_new_single.html.erb
@@ -3,7 +3,7 @@
       <div class="ur_editor_title">
         <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
         <input type="hidden" name="question_type" value="3"/>
-        <input id="poll_questions_title" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入单行文字标题"/>
+        <input 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>
diff --git a/app/views/poll/_show_single.html.erb b/app/views/poll/_show_single.html.erb
index d9ef2abc7..bfea07d86 100644
--- a/app/views/poll/_show_single.html.erb
+++ b/app/views/poll/_show_single.html.erb
@@ -7,7 +7,7 @@
     <%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")  %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 5c2925b90..e607214b5 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2247,8 +2247,8 @@ zh:
   label_statistical_results: 统计结果
   label_MC: 单选题
   label_MCQ: 多选题
-  label_single: 单行文字
-  label_mulit: 多行文字
+  label_single: 单行主观
+  label_mulit: 多行主观
   label_enter_single_title: 请输入单选题标题
   label_new_answer: 新建选项
   label_poll_title: 问卷标题

From 3acec4b7c10c082c25b1f4e79cadc8b5e1adc013 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 17 Jan 2015 10:14:07 +0800
Subject: [PATCH 076/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=80=BB?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/poll_helper.rb                | 8 +++++---
 app/views/poll/_choice_show.html.erb      | 2 +-
 app/views/poll/statistics_result.html.erb | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/helpers/poll_helper.rb b/app/helpers/poll_helper.rb
index 55418faf2..36b5deccb 100644
--- a/app/helpers/poll_helper.rb
+++ b/app/helpers/poll_helper.rb
@@ -48,15 +48,16 @@ module PollHelper
     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 options_show p
-    case p
+  #页面体型显示
+  def options_show pq
+    case pq
     when 1
       "单选题"
     when 2
@@ -65,4 +66,5 @@ module PollHelper
       "问答题"
     end
   end
+  
 end
\ No newline at end of file
diff --git a/app/views/poll/_choice_show.html.erb b/app/views/poll/_choice_show.html.erb
index 16971d5ad..4ccc5b938 100644
--- a/app/views/poll/_choice_show.html.erb
+++ b/app/views/poll/_choice_show.html.erb
@@ -19,7 +19,7 @@
       <% end %>
         <tr class="table_bluebg">
           <td class="td327"><%= l(:label_poll_valid_commit) %> </td>
-          <td class="td42"><%= poll_question.poll_votes.count %></td>
+          <td class="td42"><%= @poll.users.count %></td>
           <td class="td287">&nbsp; </td>
         </tr>
      </tbody>
diff --git a/app/views/poll/statistics_result.html.erb b/app/views/poll/statistics_result.html.erb
index 057314a9c..3ef29eb48 100644
--- a/app/views/poll/statistics_result.html.erb
+++ b/app/views/poll/statistics_result.html.erb
@@ -27,7 +27,7 @@
 		  <div class="cl"></div>
 		  <div class="ur_buttons"></div>
 		  <div class="cl"></div>
-		  </div>
+	  </div>
     </div>
   </body>
 </html>

From 9487ce1245894efa0a9a45314c4ec6de7f93ebd1 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Sat, 17 Jan 2015 11:02:09 +0800
Subject: [PATCH 077/142] =?UTF-8?q?#1807=E8=AF=BE=E7=A8=8B--=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E8=B0=83=E6=9F=A5=EF=BC=9A=E7=AD=94=E9=A2=98=E5=A4=9A?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=BB=E8=A7=82=E5=90=8E=EF=BC=8C=E5=86=8D=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=89=93=E5=BC=80=E7=AD=94=E9=A2=98=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E5=A6=82=E5=9B=BE=EF=BC=8C=E6=98=BE=E7=A4=BAhtml?=
 =?UTF-8?q?=E5=85=83=E7=B4=A0<br>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/show.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index c1ac5d377..bc5136718 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -180,7 +180,7 @@
 
                       }
                   </script>
-                  <input class="ur_text ur_textbox" type="text" size="" maxlength="" value="<%= get_anwser_vote_text(pq.id,User.current.id) %>" onblur="onblur_<%= pq.id %>(this);" <%= @can_edit_poll?"":"disabled=disabled" %>>
+                  <input class="ur_text ur_textbox" type="text" size="" maxlength="" value="<%= get_anwser_vote_text(pq.id,User.current.id).html_safe %>" onblur="onblur_<%= pq.id %>(this);" <%= @can_edit_poll?"":"disabled=disabled" %>>
                 </div>
               </li><!--单行输入 end-->
           <% elsif pq.question_type == 4 %>
@@ -222,7 +222,7 @@
                             });
                         }
                     </script>
-                    <div contenteditable='<%= @can_edit_poll %>' class="ur_textbox" style="min-height: 150px;width: 100%;<%= @can_edit_poll?"":"background-color:#DCDCDC;" %>" onblur="onblur_<%= pq.id %>(this);"><%= get_anwser_vote_text(pq.id,User.current.id) %></div>
+                    <div contenteditable='<%= @can_edit_poll %>' class="ur_textbox" style="min-height: 150px;width: 100%;<%= @can_edit_poll?"":"background-color:#DCDCDC;" %>" onblur="onblur_<%= pq.id %>(this);"><%= get_anwser_vote_text(pq.id,User.current.id).html_safe %></div>
                   </div>
                 </div>
               </li><!--多行输入 end-->

From e14deeb4ddde7393a007615920ad9bd2e53a148d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 17 Jan 2015 11:05:38 +0800
Subject: [PATCH 078/142] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=EF=BC=9A=E9=97=AE=E5=8D=B7=E6=A0=87=E9=A2=98=E6=9C=80=E5=A4=9A?=
 =?UTF-8?q?100=E5=AD=97=EF=BC=8C=E9=97=AE=E5=8D=B7=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E6=9C=80=E5=A4=9A300=E5=AD=97=EF=BC=8C=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=9C=80=E5=A4=9A250=E5=AD=97=EF=BC=8C?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E9=80=89=E9=A1=B9=E6=9C=80=E5=A4=9A200?=
 =?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_edit_MC.html.erb     | 4 ++--
 app/views/poll/_edit_MCQ.html.erb    | 4 ++--
 app/views/poll/_edit_head.html.erb   | 4 ++--
 app/views/poll/_edit_mulit.html.erb  | 2 +-
 app/views/poll/_edit_single.html.erb | 2 +-
 app/views/poll/_new_MC.html.erb      | 8 ++++----
 app/views/poll/_new_MCQ.html.erb     | 8 ++++----
 app/views/poll/_new_mulit.html.erb   | 2 +-
 app/views/poll/_new_single.html.erb  | 2 +-
 app/views/poll/_poll_form.html.erb   | 2 +-
 10 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index 12dc9f92b..505e9acc1 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -4,7 +4,7 @@
       <div class="ur_editor_title">
         <label>问题：&nbsp;&nbsp;</label>
         <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
-        <input class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入单选题标题" value="<%= poll_question.question_title%>"/>
+        <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" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
         <label>必答</label>
       </div>
@@ -13,7 +13,7 @@
           <% 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' name='question_answer[<%= poll_answer.id %>]' placeholder='新建选项' value="<%= poll_answer.answer_text%>"/>
+                <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>
diff --git a/app/views/poll/_edit_MCQ.html.erb b/app/views/poll/_edit_MCQ.html.erb
index f34319569..5e267b03e 100644
--- a/app/views/poll/_edit_MCQ.html.erb
+++ b/app/views/poll/_edit_MCQ.html.erb
@@ -2,7 +2,7 @@
   <div class="ur_editor checkbox">
     <div class="ur_editor_title">
       <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
-      <input class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入单选题标题" value="<%= poll_question.question_title%>"/>
+      <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" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
       <label>必答</label>
     </div>
@@ -11,7 +11,7 @@
         <% 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' name='question_answer[<%= poll_answer.id %>]' placeholder='新建选项' value="<%= poll_answer.answer_text%>"/>
+              <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>
diff --git a/app/views/poll/_edit_head.html.erb b/app/views/poll/_edit_head.html.erb
index ea36cbedf..802832601 100644
--- a/app/views/poll/_edit_head.html.erb
+++ b/app/views/poll/_edit_head.html.erb
@@ -1,10 +1,10 @@
 <%= form_for @poll,:remote => true do |f|%>
     <div class="ur_editor ur_title_editor"> <!--编辑头部start-->
       <div class="ur_title_editor_title">
-        <input type="text" name="polls_name" id="polls_title" value="<%= @poll.polls_name %>" class="input_title" placeholder="问卷标题"/>
+        <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" id="polls_description" class="textarea_editor"><%= @poll.polls_description%></textarea>
+        <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="$(this).parent().parent().parent().submit();">确定</a>
diff --git a/app/views/poll/_edit_mulit.html.erb b/app/views/poll/_edit_mulit.html.erb
index f4e079c17..99cd8afff 100644
--- a/app/views/poll/_edit_mulit.html.erb
+++ b/app/views/poll/_edit_mulit.html.erb
@@ -3,7 +3,7 @@
   <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 class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入多行主观标题" value="<%= poll_question.question_title%>"/>
+    <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" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
     <label for="ur_question_require">必答</label>
   </div>
diff --git a/app/views/poll/_edit_single.html.erb b/app/views/poll/_edit_single.html.erb
index b172d955c..926000c90 100644
--- a/app/views/poll/_edit_single.html.erb
+++ b/app/views/poll/_edit_single.html.erb
@@ -3,7 +3,7 @@
   <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 id="poll_questions_title_<%=poll_question.id%>" class="ur_question_title" contenteditable="true" type="text"
+    <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" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
     <label for="ur_question_require">必答</label>
diff --git a/app/views/poll/_new_MC.html.erb b/app/views/poll/_new_MC.html.erb
index 5ff70e9eb..a7f9e441b 100644
--- a/app/views/poll/_new_MC.html.erb
+++ b/app/views/poll/_new_MC.html.erb
@@ -4,7 +4,7 @@
       <div class="ur_editor_title">
         <label>问题：&nbsp;&nbsp;</label>
         <input type="hidden" name="question_type" value="1"/>
-        <input class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title" placeholder="请输入单选题标题"/>
+        <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>
@@ -12,21 +12,21 @@
         <ul>
           <li class='ur_item'>
             <label>选项<span class='ur_index'></span>：</label>
-            <input type='text' name='question_answer[0]' placeholder='新建选项'/>
+            <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 type='text' name='question_answer[1]' placeholder='新建选项'/>
+            <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 type='text' name='question_answer[2]' placeholder='新建选项'/>
+            <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>
diff --git a/app/views/poll/_new_MCQ.html.erb b/app/views/poll/_new_MCQ.html.erb
index d94964bbf..de9dc9f08 100644
--- a/app/views/poll/_new_MCQ.html.erb
+++ b/app/views/poll/_new_MCQ.html.erb
@@ -3,7 +3,7 @@
     <div class="ur_editor_title">
       <label>问题：&nbsp;&nbsp;</label>
       <input type="hidden" name="question_type" value="2"/>
-      <input class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title" placeholder="请输入多选题题标题"/>
+      <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>
@@ -11,21 +11,21 @@
       <ul>
         <li class='ur_item'>
           <label>选项<span class='ur_index'></span>：</label>
-          <input type='text' name='question_answer[0]' placeholder='新建选项'/>
+          <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 type='text' name='question_answer[1]' placeholder='新建选项'/>
+          <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 type='text' name='question_answer[2]' placeholder='新建选项'/>
+          <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>
diff --git a/app/views/poll/_new_mulit.html.erb b/app/views/poll/_new_mulit.html.erb
index 155f208c4..02f7a71a7 100644
--- a/app/views/poll/_new_mulit.html.erb
+++ b/app/views/poll/_new_mulit.html.erb
@@ -3,7 +3,7 @@
   <div class="ur_editor_title">
     <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
     <input type="hidden" name="question_type" value="4"/>
-    <input id="poll_questions_title" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入多行主观标题"/>
+    <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>
diff --git a/app/views/poll/_new_single.html.erb b/app/views/poll/_new_single.html.erb
index fb052a7a3..ffc525546 100644
--- a/app/views/poll/_new_single.html.erb
+++ b/app/views/poll/_new_single.html.erb
@@ -3,7 +3,7 @@
       <div class="ur_editor_title">
         <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
         <input type="hidden" name="question_type" value="3"/>
-        <input id="poll_questions_title" class="ur_question_title" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入单行主观标题"/>
+        <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>
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index 849ae7774..de5e2e713 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -39,7 +39,7 @@
       //单选题
       function add_single_answer(doc)
       {
-          doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：</label><input type='text' name='question_answer["+new Date().getTime()+"]' placeholder='新建选项'/>" +
+          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>");
       }

From b9ea3e589e23de6b357c6bc3ce467aaac10bfce6 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Sat, 17 Jan 2015 11:18:24 +0800
Subject: [PATCH 079/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6=E7=B3=BB=E7=BB=9F=E3=80=8B=E9=A1=B5=E9=9D=A2=20Signed?=
 =?UTF-8?q?-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Firefox - Internal Server.launch          |  1 +
 ...Internet Explorer - Internal Server.launch |  1 +
 app/controllers/application_controller.rb     |  5 ++
 app/controllers/my_controller.rb              |  3 +
 app/controllers/projects_controller.rb        |  6 +-
 app/controllers/users_controller.rb           |  3 +
 app/models/mailer.rb                          |  7 ++-
 app/views/layouts/mailer.html.erb             | 63 +++++++++++--------
 app/views/mailer/_issue.html.erb              | 50 +++++++++++----
 app/views/mailer/issue_add.html.erb           | 13 +---
 app/views/mailer/issue_add.text.erb           | 10 +--
 11 files changed, 106 insertions(+), 56 deletions(-)

diff --git a/.metadata/.plugins/org.eclipse.debug.core/.launches/Firefox - Internal Server.launch b/.metadata/.plugins/org.eclipse.debug.core/.launches/Firefox - Internal Server.launch
index f21eed9f2..678ced8a0 100644
--- a/.metadata/.plugins/org.eclipse.debug.core/.launches/Firefox - Internal Server.launch	
+++ b/.metadata/.plugins/org.eclipse.debug.core/.launches/Firefox - Internal Server.launch	
@@ -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=""/>
diff --git a/.metadata/.plugins/org.eclipse.debug.core/.launches/Internet Explorer - Internal Server.launch b/.metadata/.plugins/org.eclipse.debug.core/.launches/Internet Explorer - Internal Server.launch
index 2134fa92c..f7b0844d8 100644
--- a/.metadata/.plugins/org.eclipse.debug.core/.launches/Internet Explorer - Internal Server.launch	
+++ b/.metadata/.plugins/org.eclipse.debug.core/.launches/Internet Explorer - Internal Server.launch	
@@ -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=""/>
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index fe9f6c1b6..06e5dac30 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -275,7 +275,12 @@ class ApplicationController < ActionController::Base
       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
diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 8ee8d099e..8f00c49cd 100644
--- 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
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 5d43a4e20..4e81354f1 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -31,14 +31,16 @@ class ProjectsController < ApplicationController
   menu_item :feedback, :only => :feedback
   menu_item l(:label_course_file), :only => :index
   menu_item l(:label_course_news), :only => :index
-  
 
+# edit
+  before_filter :authorize1, :only => [:show]
+#
   before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches]
   # before_filter :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
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 7b4d488a9..ee8711e7e 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -29,6 +29,9 @@ class UsersController < ApplicationController
  
   #Ended by young
 
+  # edit
+  before_filter :auth_login1, :only => [:show]
+  #
   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,
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index b432461c7..bee0640da 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -109,9 +109,14 @@ class Mailer < ActionMailer::Base
 
     token = Token.new(:user => User.find_by_mail(recipients), :action => 'autologin')
     token.save
-    @token = token
+     @token = token
      @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id,  :token => @token.value)
 
+ # 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(:controller  => 'my', :action => 'account', :user => User.find_by_mail(recipients) ,  :token => @token.value)
+ #
 
     cc = issue.watcher_recipients - issue.recipients
     subject = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] (#{issue.status.name}) #{issue.subject}"
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index dd2de21b7..de7f4a837 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -1,33 +1,46 @@
 <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;}
+ol,ul,li{ list-style-type:none}
+.cl{ clear:both; overflow:hidden; }
+a{ text-decoration:none; }
+a:hover{ text-decoration:underline; }
+
+.mail{ width:600px; margin:20px; height:auto; color:#4b4b4b; font-size:14px; }
+.mail a{color:#1b55a7; font-weight: bold; }
+.mail_content{ margin-top:30px;}
+.c_blue{ color:#1b55a7;}
+.mail_box{ border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;}
+.mail_box_p{  float:left; display: block; width:527px;}
+a.mail_reply{ display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px;}
+a:hover.mail_reply{ background:#06a9bc; text-decoration:none;}
+.mail_fujian{ float:left; width:527px; display: block; }
+.mail_fujian a{ font-weight:normal; font-size:12px;}
+.mail_foot a{ font-size:12px; font-weight:normal;}
+
+
+
 </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>
+ <div class="container">
+	<div class="mail">
+    	<div class="mail_head">
+        	<p>亲爱的Trustie用户，您好！</p>
+        </div><!--mail_head end-->
+        <%= yield %>
+        <hr />
+        <div class="mail_foot"><%= link_to("退订该邮件？", @user_url)  %> </div><!--mail_foot end-->
+    </div>
+  </div>
 </body>
 </html>
diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb
index f0dc88d8b..326a21aaa 100644
--- a/app/views/mailer/_issue.html.erb
+++ b/app/views/mailer/_issue.html.erb
@@ -1,15 +1,39 @@
-<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">
+        <%= link_to(h("#{@issue.author}(#{@issue.author.show_name})"), @issue_author_url) %>
+     </span>在
+  <span class="c_blue"><%= link_to(h("#{@issue.project.name}"),@project_url) %></span>中有了一个与您相关的最新活动，请您关注！</p>
+<div class="mail_box">
 <ul>
-<li><%=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 %>
-</ul>
+	<li><strong>标题：</strong><%= link_to(issue.subject, issue_url) %></li>
+	<li><strong>来源：</strong><%= link_to(h("#{issue.project.name}"),@project_url) %><b>|&nbsp;</b>项目缺陷</li>
+	<li><strong style="float:left;">内容：</strong>
+                    	<p class="mail_box_p"><%= textilizable(issue, :description, :only_path => false) %></p>
+    </li>
+  <li><strong style="float:left;">附件：</strong>
+    <p class="mail_fujian">
+      <% unless @issue.attachments.nil? %>
+          <% @issue.attachments.each do |attach| %>
+          <%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %><%= l(:label_added) %></br>
+      <% end %>
+    <% end %>
 
-<%= textilizable(issue, :description, :only_path => false) %>
+    </p>
+  </li>
+</ul>
+  <label  class="mail_reply"><%= link_to( "我要回复", issue_url) %></label>
+  <div class="cl"></div>
+</div>
+<!-- <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 %>
+-->
diff --git a/app/views/mailer/issue_add.html.erb b/app/views/mailer/issue_add.html.erb
index 3f0fce917..f51dad121 100644
--- a/app/views/mailer/issue_add.html.erb
+++ b/app/views/mailer/issue_add.html.erb
@@ -1,15 +1,8 @@
+<div class="mail_content">
 
 
-<%= l(:text_issue_added, :id => "##{@issue.project_index}", :author => h(@issue.author)) %>
-<ul>
+         <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
 
-    <% unless @issue.attachments.nil? %>
-  <% @issue.attachments.each do |attach| %>
-    <li>  <%= l(:label_attachment) %><%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %><%= l(:label_added) %></li>
-  <% end %>
-<% end %>
 
-</ul>
-<hr />
+</div>
 
-<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
\ No newline at end of file
diff --git a/app/views/mailer/issue_add.text.erb b/app/views/mailer/issue_add.text.erb
index 4fb52b94c..07411a134 100644
--- a/app/views/mailer/issue_add.text.erb
+++ b/app/views/mailer/issue_add.text.erb
@@ -1,11 +1,11 @@
-<%= l(:text_issue_added, :id => "##{@issue.project_index}", :author => @issue.author) %>
-
+<%= link_to(h("#{@issue.author}"+"(#{@issue.author_id.firstname+@issue.author_id.lastname})"), @issue_author_url) %>在<%= link_to(h("#{@issue.project.name}"),@project_url) %>
+<%#= l(:text_issue_added, :id => "##{@issue.project_index}", :author => @issue.author) %> !-->
+<%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
 <% @issue.attachments.each do |attach| %>
-   <%= l(:label_attachment) %>
      <%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %> <%= l(:label_added) %>
 <% end %>
 
 ----------------------------------------
-
-<%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
+<%= link_to( "我要回复", @issue_url) %>
+ <%#=  render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
 

From 0f5c3c5f4c67ca373fb78cb7e6b2a1c9986cf13b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 17 Jan 2015 11:46:34 +0800
Subject: [PATCH 080/142] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=BB=E8=A7=82?=
 =?UTF-8?q?=E9=A2=98=E7=BB=9F=E8=AE=A1=E9=A1=B5=E9=9D=A2=E5=8F=8A=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/poll_helper.rb                |  4 +++-
 app/views/poll/_quiz_answers.html.erb     | 18 ++++++++++++++++++
 app/views/poll/statistics_result.html.erb |  8 ++++++--
 config/locales/zh.yml                     |  4 +++-
 public/stylesheets/polls.css              |  1 +
 5 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 app/views/poll/_quiz_answers.html.erb

diff --git a/app/helpers/poll_helper.rb b/app/helpers/poll_helper.rb
index 36b5deccb..47612f825 100644
--- a/app/helpers/poll_helper.rb
+++ b/app/helpers/poll_helper.rb
@@ -62,8 +62,10 @@ module PollHelper
       "单选题"
     when 2
       "多选题"
+    when 3
+      "单行主观"
     else
-      "问答题"
+      "多行主观"
     end
   end
   
diff --git a/app/views/poll/_quiz_answers.html.erb b/app/views/poll/_quiz_answers.html.erb
new file mode 100644
index 000000000..f2cfff5cc
--- /dev/null
+++ 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 %>dddd </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>
+
diff --git a/app/views/poll/statistics_result.html.erb b/app/views/poll/statistics_result.html.erb
index 3ef29eb48..a33daacfb 100644
--- a/app/views/poll/statistics_result.html.erb
+++ b/app/views/poll/statistics_result.html.erb
@@ -10,14 +10,18 @@
 	  <div class="ur_page_head" >
 		<h1 class="ur_page_title"><%= @poll.polls_name %> <%= l(:label_poll) %></h1>
 	  </div> 
-      <% @poll_questions.each do |poll_question| %>
 	  <div class="">
+      <% @poll_questions.each do |poll_question| %>	  
 	    <ol>
 		  <li class="ur_question_item">
 		    <div class="ur_title_result">
 			  <span class="title_index">第<%= poll_question.question_number %>题：</span><%= poll_question.question_title %> <span class="title_index">[<%= options_show(poll_question.question_type) %>]</span>
 			</div>
-			  <%= render :partial =>'choice_show', :locals =>{ :poll_question => poll_question } %>
+			  <% if poll_question.question_type == 1 || poll_question.question_type == 2 %>
+			  	<%= render :partial =>'choice_show', :locals =>{ :poll_question => poll_question } %>
+			  <% else %>
+			    <%= render :partial =>'quiz_answers', :locals =>{ :poll_question => poll_question } %>
+			  <% end %>
 		  </li>
 		</ol>
 	  <% end %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 5fe8a6560..7f7d00ba3 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2262,5 +2262,7 @@ zh:
   label_poll_proportion: 比例
   label_poll_valid_commit: 本题有效填写人次
   label_poll_result: 问卷调查_问卷统计
-
+  label_answer: 答案
+  label_poll_answer_valid_result: 以上为有效问答题答案！
+  label_answer_total: 总计：
 
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index e89e50be4..b81308c70 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -68,6 +68,7 @@ a:hover.ur_button{ background:#0fa9bb; text-decoration:none;}
 .td327{ width:300px; padding-left:5px;}
 .td42{ width:42px; text-align:center;}
 .td287{ width:259px;padding-left:5px; }
+.td111{ width:601px;padding-left:5px; }
 .Bar{ position: relative; width: 120px; border: 1px solid #cbcbcb; float:left; height:10px; margin-top:5px; margin-right:3px; }
 .Bar span{ display: block; position: relative;background:#64badb;/* 进度条背景颜色 */ color: #333333;height: 10px; /* 高度 */ line-height: 20px; }
 .ur_progress_text{ color:#3a3a3a;}

From 1602d2e439793613044db53eff0a7d480a5215a8 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Sat, 17 Jan 2015 11:46:45 +0800
Subject: [PATCH 081/142] Signed-off-by: alan <547533434@qq.com>

---
 app/views/mailer/_issue.text.erb | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/app/views/mailer/_issue.text.erb b/app/views/mailer/_issue.text.erb
index 7ab8acfeb..6be5544b8 100644
--- a/app/views/mailer/_issue.text.erb
+++ b/app/views/mailer/_issue.text.erb
@@ -1,13 +1,18 @@
-<%= "#{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("#{@issue.author}(#{@issue.author.show_name})"), @issue_author_url) %>
+     在
+ <%= link_to(h("#{@issue.project.name}"),@project_url) %>中有了一个与您相关的最新活动，请您关注！
+标题：<%= link_to(issue.subject, issue_url) %>
+  来源：<%= link_to(h("#{issue.project.name}"),@project_url) %>|&nbsp;项目缺陷<
+ 内容：
+     <%= textilizable(issue, :description, :only_path => false) %>
+ 附件：
+
+        <% unless @issue.attachments.nil? %>
+            <% @issue.attachments.each do |attach| %>
+                <%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %><%= l(:label_added) %>
+            <% end %>
+        <% end %>
+
+
+ <%= link_to( "我要回复", issue_url) %>

From 092dd61c86ba79a74454f680ec8ed3953b85f405 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Sat, 17 Jan 2015 11:51:59 +0800
Subject: [PATCH 082/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=B5=84=E6=96=99=E5=A4=84=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/show.html.erb                              | 2 +-
 public/stylesheets/polls.css                              | 6 +++---
 public/themes/redpenny-master/stylesheets/application.css | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index bc5136718..d20f46297 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -180,7 +180,7 @@
 
                       }
                   </script>
-                  <input class="ur_text ur_textbox" type="text" size="" maxlength="" value="<%= get_anwser_vote_text(pq.id,User.current.id).html_safe %>" onblur="onblur_<%= pq.id %>(this);" <%= @can_edit_poll?"":"disabled=disabled" %>>
+                  <input class="ur_text ur_textbox" type="text" size="" maxlength="" style="width: 100%" value="<%= get_anwser_vote_text(pq.id,User.current.id).html_safe %>" onblur="onblur_<%= pq.id %>(this);" <%= @can_edit_poll?"":"disabled=disabled" %>>
                 </div>
               </li><!--单行输入 end-->
           <% elsif pq.question_type == 4 %>
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index e89e50be4..b238eedd8 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -94,13 +94,13 @@ a:hover.tab_item02{ background:#fff;}
 
 .ur_editor {width:655px; border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px;}
 .ur_title_editor_title{ margin-bottom:10px;}
-.input_title{ width:630px; height:40px; padding:0 10px; text-align:center; font-size:16px; font-weight:bold;}
-.textarea_editor{  width:632px; height:120px; padding:10px; margin-bottom:10px;}
+.input_title{ width:630px; height:40px; padding:0 10px; text-align:center; font-size:16px; font-weight:bold;border: 1px solid #DCDCDC !important;}
+.textarea_editor{  width:632px; height:120px; padding:10px; margin-bottom:10px;border: 1px solid #DCDCDC !important;}
 .btn_submit{ width:56px; height:24px;  padding-top:4px;background:#15bccf; color:#fff; text-align:center; display:block; float:left; margin-right:10px;}
 a:hover.btn_submit{background:#0fa9bb;}
 .btn_cancel{width:54px; height:22px;  padding-top:4px;background:#fff; color:#999; border:1px solid #999; text-align:center; display:block; float:left; }
 a:hover.btn_cancel{ color:#666;}
-.ur_question_title{ width:534px; height:30px; border:1px solid #cbcbcb; padding:0 5px !important; margin-right:10px;}
+.ur_question_title{ width:534px; height:30px; border:1px solid #cbcbcb; padding:0 5px !important; margin-right:10px;border: 1px solid #DCDCDC !important;}
 .ur_editor_title{ margin-bottom:10px;}
 .ur_editor_content{ }
 .ur_item{ margin-bottom:5px; height:32px; }
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index 897434393..936610c6b 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -851,8 +851,8 @@ p.breadcrumb
 
 input[type="text"],input[type="password"],textarea,select
 {
-  #padding:2px;
-  #border:1px solid #039ea0
+  padding:2px;
+  border:1px solid #039ea0
 }
 
 input[type="text"],input[type="password"]

From 4e19690887a77152884bfc33dc7e3c6a7eb55981 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 17 Jan 2015 11:58:19 +0800
Subject: [PATCH 083/142] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=A4=9A=E8=A1=8C=E4=B8=BB=E8=A7=82=E5=90=8E?=
 =?UTF-8?q?=E5=A4=9A=E8=A1=8C=E4=B8=BB=E8=A7=82=E4=BB=8E=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B6=88=E5=A4=B1=202.=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=90=8E=E5=8F=96=E6=B6=88=EF=BC=8C=E7=AC=AC=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E7=BC=96=E8=BE=91=E5=8D=B4=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=89=8D=E4=B8=80=E6=AC=A1=E7=BC=96=E8=BE=91=E7=9A=84=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=20#1810=20#1806?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_edit_MC.html.erb     | 23 ++++++++++++++++++++---
 app/views/poll/_edit_MCQ.html.erb    | 22 +++++++++++++++++++---
 app/views/poll/_edit_mulit.html.erb  | 11 +++++++++--
 app/views/poll/_edit_single.html.erb | 11 +++++++++--
 4 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index 505e9acc1..066eafe0d 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -1,15 +1,32 @@
 <%= 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" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
+        <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>
+        <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>
@@ -23,7 +40,7 @@
       </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="pollQuestionCancel(<%= poll_question.id%>);">取消</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>
diff --git a/app/views/poll/_edit_MCQ.html.erb b/app/views/poll/_edit_MCQ.html.erb
index 5e267b03e..613fed371 100644
--- a/app/views/poll/_edit_MCQ.html.erb
+++ b/app/views/poll/_edit_MCQ.html.erb
@@ -1,13 +1,29 @@
 <%= 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" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
+      <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>
+      <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>
@@ -21,7 +37,7 @@
     </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="pollQuestionCancel(<%= poll_question.id%>);">取消</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-->
diff --git a/app/views/poll/_edit_mulit.html.erb b/app/views/poll/_edit_mulit.html.erb
index 99cd8afff..d498169f4 100644
--- a/app/views/poll/_edit_mulit.html.erb
+++ b/app/views/poll/_edit_mulit.html.erb
@@ -1,10 +1,17 @@
 <%= 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" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
+    <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">
@@ -14,7 +21,7 @@
   </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>
+    <a class="btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">取消</a>
   </div>
   <div class="cl"></div>
 </div><!--编辑多行文字end-->
diff --git a/app/views/poll/_edit_single.html.erb b/app/views/poll/_edit_single.html.erb
index 926000c90..2c2d41e0f 100644
--- a/app/views/poll/_edit_single.html.erb
+++ b/app/views/poll/_edit_single.html.erb
@@ -1,16 +1,23 @@
 <%= 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" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
+    <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="pollQuestionCancel(<%= poll_question.id%>);">取消</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-->

From bba213dec9505c52cf658d4dc48957725611da9b Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 17 Jan 2015 12:12:06 +0800
Subject: [PATCH 084/142] =?UTF-8?q?1.#1802=20=E4=BF=AE=E5=A4=8D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=8B=E6=96=B9=E6=9C=89=E5=BE=88=E5=A4=A7=E4=B8=80?=
 =?UTF-8?q?=E7=89=87=E7=A9=BA=E7=99=BD=202.=E4=BF=AE=E5=A4=8D=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=96=87=E6=9C=AC=E6=A1=86=E7=9A=84padding=E3=80=81ma?=
 =?UTF-8?q?rgin=E9=83=BD=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_feedback.html.erb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb
index 859ed0361..87a30346e 100644
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@@ -60,18 +60,18 @@ function f_submit()
 </script>
 
 <style type="text/css">
-/*浮窗*/ 
-body{ height:3000px; font-family:'微软雅黑';} 
-div,ul,li,body,h3,p{margin:0; padding:0;} 
+/*浮窗*/
+/*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; } 
+.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;
@@ -100,11 +100,11 @@ a:hover.opnionButton{ text-decoration:underline;}
 	
 	<% get_memo %>
 		<%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
-	<div class="actions" style="max-width:680px">
-		<p>
+	    <div class="actions" style="max-width:680px;">
+		<p style="margin:0; padding:0;">
           <%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%>
         </p>
-        <p>
+        <p style="margin:0; padding:0;">
           <%= f.hidden_field :content, :required => true ,:value=>'该贴来自用户反馈！'%>
         </p>
 		  <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %>
@@ -119,7 +119,7 @@ a:hover.opnionButton{ text-decoration:underline;}
 
 <div class="opnionCall">
 	<div class="tectitle">技术支持：</div>
-    <p ><%= l(:label_course_adcolick) %><a href="http://user.trustie.net/users/12/user_newfeedback">黄井泉</a><br>
+    <p style="margin:0; padding:0;" ><%= 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>
 

From b3f37f515411b2f8876ec598f2f7eb055227b460 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 17 Jan 2015 12:13:03 +0800
Subject: [PATCH 085/142] 111

---
 app/views/layouts/_base_feedback.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb
index 87a30346e..52006e94d 100644
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@@ -63,7 +63,7 @@ function f_submit()
 /*浮窗*/
 /*body{ height:3000px; font-family:'微软雅黑';}*/
 /*div,ul,li,body,h3,p{margin:0; padding:0;}*/
-a{ text-decoration:none;}
+    #roll 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; }

From ad7014f8b66d7e4ca2ced0ebba9d59960118cfa1 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 17 Jan 2015 12:20:47 +0800
Subject: [PATCH 086/142] =?UTF-8?q?#1809=E6=96=B0=E5=BB=BA/=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=97=AE=E9=A2=98=E5=86=85=E5=AE=B9=E6=88=96=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E9=95=BF=E5=BA=A6=E8=B6=B3=E5=A4=9F=E9=95=BF=E4=B8=94?=
 =?UTF-8?q?=E4=B8=BA=E9=9D=9E=E6=B1=89=E5=AD=97=E7=B1=BB=E5=9E=8B=EF=BC=8C?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B6=85=E5=87=BA=E8=BE=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/polls.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 0476f4291..5864a9801 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -42,15 +42,15 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
 
 /*问卷页面*/
 .polls_box{ border:1px solid #dcdcdc; padding:15px 30px;}
-.ur_page_title{ font-size:16px;  text-align:center; color:#353535;}
+.ur_page_title{ font-size:16px;  text-align:center; color:#353535;word-break: break-all; word-wrap: break-word;}
 .ur_prefix_content{ color:#656565; text-indent:30px; margin-top:10px; }
 .ur_card{border-top:1px solid #dcdcdc;margin-top:20px; color:#3a3a3a;}
-.ur_title{ padding:20px 0px ; float:left; width:604px; }
+.ur_title{ padding:20px 0px ; float:left; width:604px; word-break: break-all; word-wrap: break-word;}
 .ur_required{ font-weight: bold; color:red;}
 .ur_inputs{ color:#666;}
 .ur_table{border-top:1px solid #dcdcdc;}
 .ur_inputs tr td{ height:40px;border-bottom:1px solid #dcdcdc; width:617px;}
-.ur_inputs label{ padding-left:10px;}
+.ur_inputs label{ padding-left:10px;word-break: break-all; word-wrap: break-word;}
 .ur_inputs input{ margin-right:5px;}
 .ur_text{ height:30px;}
 .ur_textbox{ border:1px solid #dcdcdc !important; color:#676765;}

From 6e698d45bb853a4c0a92f588ba61f4f1a2f7a139 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 17 Jan 2015 12:34:57 +0800
Subject: [PATCH 087/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86html?=
 =?UTF-8?q?=E8=BE=B9=E7=95=8C=E8=B6=85=E5=87=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/poll_helper.rb            | 4 ++--
 app/views/poll/_quiz_answers.html.erb | 2 +-
 public/stylesheets/polls.css          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/helpers/poll_helper.rb b/app/helpers/poll_helper.rb
index 47612f825..7497e4d79 100644
--- a/app/helpers/poll_helper.rb
+++ b/app/helpers/poll_helper.rb
@@ -63,9 +63,9 @@ module PollHelper
     when 2
       "多选题"
     when 3
-      "单行主观"
+      "单行主观题"
     else
-      "多行主观"
+      "多行主观题"
     end
   end
   
diff --git a/app/views/poll/_quiz_answers.html.erb b/app/views/poll/_quiz_answers.html.erb
index f2cfff5cc..34086d25e 100644
--- a/app/views/poll/_quiz_answers.html.erb
+++ b/app/views/poll/_quiz_answers.html.erb
@@ -6,7 +6,7 @@
       </tr>
       <% poll_question.poll_votes.each do |poll_vote| %>
       	<tr>     		
-          <td class="td111"><%= poll_vote.vote_text %>dddd </td>
+          <td class="td111"><%= poll_vote.vote_text.html_safe %> </td>
       	</tr>     
       <% end %>
         <tr class="table_bluebg">
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index b81308c70..728126267 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -65,10 +65,10 @@ a:hover.ur_button{ background:#0fa9bb; text-decoration:none;}
 .ur_table_result{ color:#5d5d5d;border-right:1px solid #cbcbcb;border-bottom:1px solid #cbcbcb;}
 .ur_table_result tr td{ border-left:1px solid #cbcbcb;border-top:1px solid #cbcbcb; height:20px;}
 .table_bluebg{ background:#d7e5ee; color:#2f3a40; height:24px;}
-.td327{ width:300px; padding-left:5px;}
+.td327{ width:601px; padding-left:5px;}
 .td42{ width:42px; text-align:center;}
 .td287{ width:259px;padding-left:5px; }
-.td111{ width:601px;padding-left:5px; }
+.td111{ width:601px;padding-left:5px; word-break:break-all; word-wrap:break-word }
 .Bar{ position: relative; width: 120px; border: 1px solid #cbcbcb; float:left; height:10px; margin-top:5px; margin-right:3px; }
 .Bar span{ display: block; position: relative;background:#64badb;/* 进度条背景颜色 */ color: #333333;height: 10px; /* 高度 */ line-height: 20px; }
 .ur_progress_text{ color:#3a3a3a;}

From 629c4aaaa1352f79b71c2963157ed3385a0bf55f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 17 Jan 2015 13:30:50 +0800
Subject: [PATCH 088/142] =?UTF-8?q?1=E3=80=81#1814=20=E6=9C=AA=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E7=9A=84=E9=97=AE=E5=8D=B7=E6=98=BE=E7=A4=BA=E5=9C=A8?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E7=9A=84=E9=97=AE=E5=8D=B7=E6=80=BB=E6=95=B0?=
 =?UTF-8?q?=E4=B8=AD=202=E3=80=81=E4=BF=AE=E5=A4=8D=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E8=BF=87=E9=95=BF=EF=BC=8C=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=203?=
 =?UTF-8?q?=E3=80=81=E5=B7=B2=E5=8F=91=E5=B8=83=E7=9A=84=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb |  6 ++-
 app/views/poll/index.html.erb      | 76 +++++++++++++++---------------
 public/stylesheets/polls.css       |  2 +-
 3 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 6a4ba0cc5..ce031f586 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -7,7 +7,11 @@ class PollController < ApplicationController
   def index
     if @course
       @is_teacher = User.current.allowed_to?(:as_teacher,@course)
-      polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id}")
+      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,10 #分页
       respond_to do |format|
         format.html{render :layout => 'base_courses'}
diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index 0e5e956ca..e57674c7a 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -11,46 +11,46 @@
   <div class="cl"></div>
   <div class="polls_list">
     <% @polls.each do |poll|%>
-
-          <% unless !@is_teacher && poll.polls_status != 2 %>
-            <ul id="polls_<%= poll.id %>">
-              <li>
-                <% if @is_teacher %>
-                    <% if has_commit_poll?(poll.id ,User.current) %>
-                        <sapn class="polls_title fl"> <%= poll.polls_name %></sapn>
-                    <% else %>
-                        <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
-                    <% end %>
+        <ul id="polls_<%= poll.id %>">
+          <li title="<%= poll.polls_name %>">
+            <% if @is_teacher %>
+                <% if has_commit_poll?(poll.id ,User.current) %>
+                    <sapn class="polls_title fl"> <%= poll.polls_name %></sapn>
                 <% else %>
-                    <% if has_commit_poll?(poll.id ,User.current) && poll.polls_status == 2 %>
-                        <sapn class="polls_title fl"> <%= poll.polls_name %></sapn>
-                    <% elsif (!has_commit_poll?(poll.id ,User.current)) && poll.polls_status == 2 %>
-                        <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
-                    <% end %>
+                    <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
                 <% end %>
-              </li>
-              <li>
-                <%if @is_teacher%>
-                    <%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fl ml10"%>
-                <% end%>
-              </li>
-              <li>
-                <% if @is_teacher && poll.polls_status == 1 #新建状态的问卷可删除%>
-                    <%= 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 && poll.polls_status == 1 #新建状态的问卷可编辑%>
-                    <%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml20"%>
-                <% end%>
-              </li>
-              <li class="polls_date fr">
-                <%= format_time poll.created_at%>
-              </li>
-            </ul>
-          <% end %>
-
+            <% else %>
+                <% if has_commit_poll?(poll.id ,User.current) && poll.polls_status == 2 %>
+                    <sapn class="polls_title fl" >
+                      <%= poll.polls_name %>
+                    </sapn>
+                <% elsif (!has_commit_poll?(poll.id ,User.current)) && poll.polls_status == 2 %>
+                    <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
+                <% end %>
+            <% end %>
+          </li>
+          <li>
+            <%if @is_teacher && poll.polls_status == 2%>
+                <%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fl ml10"%>
+            <% 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 && poll.polls_status == 1%>
+                <!--新建状态的问卷可编辑-->
+                <%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml20"%>
+            <% end%>
+          </li>
+          <li class="polls_date fr">
+            <%= format_time poll.created_at%>
+          </li>
+        </ul>
         <div class="cl"></div>
     <% end%>
 
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 5864a9801..324fb2bb9 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -26,7 +26,7 @@ div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margi
 a.newbtn{ float:right; display:block; width:80px; height:30px; background:#64bdd9; color:#fff; font-size:14px; margin:10px; text-align:center;}
 a:hover.newbtn{ background:#55a1b9; text-decoration:none;}
 .polls_list ul{ padding-left:10px; border-bottom:1px dashed #c9c9c9; height:32px; padding-top:8px;}
-a.polls_title{ font-weight:bold; color:#3e6d8e;}
+a.polls_title{ font-weight:bold; color:#3e6d8e;max-width: 350px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
 .polls_title{ font-weight:bold; color:#3e6d8e;}
 a.pollsbtn{ display:block; width:66px; height:22px; text-align:center; border:1px solid #64bdd9; color:#64bdd9;}
 a:hover.pollsbtn{ background:#64bdd9; color:#fff; text-decoration:none;}

From 05b1b9741b11c4abfaf5294276c9b2931549f908 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Sat, 17 Jan 2015 13:35:15 +0800
Subject: [PATCH 089/142] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9=E4=B8=BA=E6=AF=8F=E9=A1=B5?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA5=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 6a4ba0cc5..dd0b498a7 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -26,7 +26,7 @@ class PollController < ApplicationController
       @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,3 #分页
+      @poll_questions = paginateHelper poll_questions,5 #分页
       respond_to do |format|
         format.html {render :layout => 'base_courses'}
       end

From 8e017425cfd77f344dd22d8fcc121a4bdc51627b Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 17 Jan 2015 13:55:59 +0800
Subject: [PATCH 090/142] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E6=A1=86=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll_form.html.erb   |  7 ++--
 app/views/poll/_poll_submit.html.erb | 50 +++++++++-------------------
 public/stylesheets/polls.css         | 14 ++++++++
 3 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index de5e2e713..49e04a3ba 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -58,13 +58,14 @@
       function poll_submit()
       {
           $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { poll: @poll}) %>');
-          showModal('ajax-modal', '500px');
-          $('#ajax-modal').css('height','180px');
+          showModal('ajax-modal', '310px');
+          $('#ajax-modal').css('height','100px');
           $('#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("anonymos");
+          $('#ajax-modal').parent().addClass("popbox_polls");
       }
   </script>
 </head>
diff --git a/app/views/poll/_poll_submit.html.erb b/app/views/poll/_poll_submit.html.erb
index 0f9e96b73..cdc41dd9d 100644
--- a/app/views/poll/_poll_submit.html.erb
+++ b/app/views/poll/_poll_submit.html.erb
@@ -1,28 +1,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>开启匿评功能</title>
-  <style>
-      #popbox02{ font-size:12px; font-family:"微软雅黑","宋体"; background:#fff; font-style:normal;}
-      #popbox02 div,img,tr,td,textarea{ border:0;}
-      #popbox02 table,tr,td{border:0; cellspacing:0; cellpadding:0;}
-      #popbox02 ul,li{ list-style-type:none}
-      #popbox02 .cl{ clear:both; overflow:hidden; }
-      #popbox02 a{ text-decoration:none; }
-      #popbox02 a:hover{ text-decoration:underline;}
-      /* 问卷发布弹框 */
-      .anonymos{width:480px;height:180px;position:fixed;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
-      .ni_con { width:425px; margin:25px 30px;}
-      .ni_con h2{ display:block; height:40px; width:425px;   text-align:center; color:#3a3a3a;}
-      .ni_con p{ color:#808181; }
-      .ni_con a:hover{ text-decoration:none;}
-      .ni_btn{ width:190px; margin:15px auto;  line-height:1.9;}
-      a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:15px;}
-      a:hover.tijiao{ background:#0f99a9;}
-      .c_blue{ color:#0195bd;}
-      .c_pink{ color:#e65d5e;}
-  </style>
-
   <script type="text/javascript">
       function clickPublishPoll()
       {
@@ -42,21 +20,23 @@
 
 <body>
 <div id="popbox02">
-  <div class="ni_con">
-    <h2>问卷发布</h2>
-    <p style="text-align: center">
-      问卷发布后将无法
-      <span class="c_blue">修改</span>
-      <br/>
-      是否确定发布该问卷？
-    </p>
-    <div class="ni_btn">
-      <%= link_to "确    定",publish_poll_poll_path(poll.id), :class => "tijiao", :onclick => "clickCanel();" %>
-      <a href="#" class="tijiao" onclick="clickCanel();">
-        取&nbsp;&nbsp;消
-      </a>
+  <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), :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>
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 324fb2bb9..e14565b50 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -120,3 +120,17 @@ a.ur_icon_de{ background:url(images/icons.png) 0px -338px no-repeat; width:16px;
 a:hover.ur_icon_de{ background:url(images/icons.png) -20px -338px no-repeat;}
 .ur_icon_edit{ background:url(images/icons.png) 0px -272px no-repeat; width:16px; height:27px; display:block;float:right; margin-top:15px; margin-right:10px;}
 a:hover.ur_icon_edit{ background:url(images/icons.png) -21px -272px  no-repeat;}
+
+/***弹框***/
+.popbox_polls{width:300px;height:100px;position:fixed;z-index:100;left:50%;top:50%;margin:-100px 0 0 -150px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81;  overflow:auto;}
+.alert .close02{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-310px;background:url(/images/bid/close.png) no-repeat;cursor:pointer;}
+.upload_box{ width:270px; margin:15px auto;}
+.polls_box_p{ font-size:14px; text-align:center;}
+a.upload_btn{ display:block; float:left; margin:15px 0 5px; width:60px; padding: 7px 0; text-align: center; color:#fff; font-size:14px; background:#15bccf; margin-right:10px;}
+a:hover.upload_btn{ background:#06a9bc;}
+a.upload_btn_grey{background:#a3a3a3;}
+a:hover.upload_btn_grey{background:#8a8a8a;}
+.upload_con p{ color:#808181;}
+.upload_con a:hover{ text-decoration:none;}
+.polls_btn_box{ width:145px; margin:0 auto; padding-left:10px;}
+.polls_btn_box02{ width:80px; margin:0 auto; padding-left:10px;}

From 6bba6b2b76e73ecefbe25077844cb7d1c7c62e5b Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 17 Jan 2015 14:04:20 +0800
Subject: [PATCH 091/142] weiwan

---
 app/helpers/poll_helper.rb           | 4 ++++
 app/views/poll/_choice_show.html.erb | 2 +-
 config/locales/zh.yml                | 2 +-
 public/stylesheets/polls.css         | 6 +++---
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/helpers/poll_helper.rb b/app/helpers/poll_helper.rb
index 7497e4d79..da49219be 100644
--- a/app/helpers/poll_helper.rb
+++ b/app/helpers/poll_helper.rb
@@ -55,6 +55,10 @@ module PollHelper
     t == 0 ? 0 : format("%.2f", e*100/t)
   end
   
+  # def total_answer
+    # poll_question.poll_votes(distinct a.ID   
+  # end
+#   
   #页面体型显示
   def options_show pq
     case pq
diff --git a/app/views/poll/_choice_show.html.erb b/app/views/poll/_choice_show.html.erb
index 4ccc5b938..16971d5ad 100644
--- a/app/views/poll/_choice_show.html.erb
+++ b/app/views/poll/_choice_show.html.erb
@@ -19,7 +19,7 @@
       <% end %>
         <tr class="table_bluebg">
           <td class="td327"><%= l(:label_poll_valid_commit) %> </td>
-          <td class="td42"><%= @poll.users.count %></td>
+          <td class="td42"><%= poll_question.poll_votes.count %></td>
           <td class="td287">&nbsp; </td>
         </tr>
      </tbody>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 7f7d00ba3..ac7c52fe2 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2262,7 +2262,7 @@ zh:
   label_poll_proportion: 比例
   label_poll_valid_commit: 本题有效填写人次
   label_poll_result: 问卷调查_问卷统计
-  label_answer: 答案
+  label_answer: 答案：
   label_poll_answer_valid_result: 以上为有效问答题答案！
   label_answer_total: 总计：
 
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 3f66f7311..8289cc1d2 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -65,10 +65,10 @@ a:hover.ur_button{ background:#0fa9bb; text-decoration:none;}
 .ur_table_result{ color:#5d5d5d;border-right:1px solid #cbcbcb;border-bottom:1px solid #cbcbcb;}
 .ur_table_result tr td{ border-left:1px solid #cbcbcb;border-top:1px solid #cbcbcb; height:20px;}
 .table_bluebg{ background:#d7e5ee; color:#2f3a40; height:24px;}
-.td327{ width:601px; padding-left:5px;}
+.td327{ width:601px; padding-left:5px; word-break:break-all; word-wrap:break-word; }
 .td42{ width:42px; text-align:center;}
-.td287{ width:259px;padding-left:5px; }
-.td111{ width:601px;padding-left:5px; word-break:break-all; word-wrap:break-word }
+.td287{ width:259px;padding-left:5px; text-align:center; }
+.td111{ width:601px;padding-left:5px; word-break:break-all; word-wrap:break-word; }
 .Bar{ position: relative; width: 120px; border: 1px solid #cbcbcb; float:left; height:10px; margin-top:5px; margin-right:3px; }
 .Bar span{ display: block; position: relative;background:#64badb;/* 进度条背景颜色 */ color: #333333;height: 10px; /* 高度 */ line-height: 20px; }
 .ur_progress_text{ color:#3a3a3a;}

From 8a05e032af91fedf3962ff7d0809e3f9d038b429 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 17 Jan 2015 14:10:44 +0800
Subject: [PATCH 092/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=98=E5=9E=8B?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_show_MC.html.erb     | 2 +-
 app/views/poll/_show_MCQ.html.erb    | 2 +-
 app/views/poll/_show_mulit.html.erb  | 2 +-
 app/views/poll/_show_single.html.erb | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/poll/_show_MC.html.erb b/app/views/poll/_show_MC.html.erb
index 594baea9d..ff8e52f25 100644
--- a/app/views/poll/_show_MC.html.erb
+++ b/app/views/poll/_show_MC.html.erb
@@ -4,10 +4,10 @@
       第<%= 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")  %>
diff --git a/app/views/poll/_show_MCQ.html.erb b/app/views/poll/_show_MCQ.html.erb
index 64e39523a..63b9d1c1f 100644
--- a/app/views/poll/_show_MCQ.html.erb
+++ b/app/views/poll/_show_MCQ.html.erb
@@ -4,10 +4,10 @@
       第<%= 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")  %>
diff --git a/app/views/poll/_show_mulit.html.erb b/app/views/poll/_show_mulit.html.erb
index 23bdbe6eb..2d52fffb5 100644
--- a/app/views/poll/_show_mulit.html.erb
+++ b/app/views/poll/_show_mulit.html.erb
@@ -5,10 +5,10 @@
         第<%= 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")  %>
diff --git a/app/views/poll/_show_single.html.erb b/app/views/poll/_show_single.html.erb
index bfea07d86..8caa7b1a5 100644
--- a/app/views/poll/_show_single.html.erb
+++ b/app/views/poll/_show_single.html.erb
@@ -4,10 +4,10 @@
       第<%= 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")  %>

From 233070b277e209e7501d1538c7f42dc48bd5b4c2 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 17 Jan 2015 14:16:26 +0800
Subject: [PATCH 093/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=81=AB=E7=8B=90?=
 =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E4=B8=AD=E6=98=BE=E7=A4=BA=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/polls.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index d0622aaad..b1ef97def 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -49,7 +49,7 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
 .ur_required{ font-weight: bold; color:red;}
 .ur_inputs{ color:#666;}
 .ur_table{border-top:1px solid #dcdcdc;}
-.ur_inputs tr td{ height:40px;border-bottom:1px solid #dcdcdc; width:617px;}
+.ur_inputs tr td{ height:40px;border-bottom:1px solid #dcdcdc; width:617px;word-break: break-all; word-wrap: break-word;}
 .ur_inputs label{ padding-left:10px;word-break: break-all; word-wrap: break-word;}
 .ur_inputs input{ margin-right:5px;}
 .ur_text{ height:30px;}

From 26b3aab6a2fbd2b1e312b68d83640fa9bb40c444 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Sat, 17 Jan 2015 14:18:45 +0800
Subject: [PATCH 094/142] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=98=E5=9E=8B?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/show.html.erb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index d20f46297..08c2608d0 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -48,6 +48,7 @@
                 <div class="ur_title">
                   <span class="title_index"><%= l(:label_question_number,:question_number => pq.question_number) %></span>
                   <%= pq.question_title %>
+                  <span class="title_index">[单选题]</span>
                   <% if pq.is_necessary == 1 %>
                     <span class="ur_required" title="<%= l(:label_must_answer) %>">*</span>
                   <% end %>
@@ -97,6 +98,7 @@
                 <div class="ur_title">
                   <span class="title_index"><%= l(:label_question_number,:question_number => pq.question_number) %></span>
                   <%= pq.question_title %>
+                  <span class="title_index">[多选题]</span>
                   <% if pq.is_necessary == 1 %>
                       <span class="ur_required" title="<%= l(:label_must_answer) %>">*</span>
                   <% end %>
@@ -153,6 +155,7 @@
                 <div class="ur_title">
                   <span class="title_index"><%= l(:label_question_number,:question_number => pq.question_number) %></span>
                   <%= pq.question_title %>
+                  <span class="title_index">[单行主观]</span>
                   <% if pq.is_necessary == 1 %>
                       <span class="ur_required" title="<%= l(:label_must_answer) %>">*</span>
                   <% end %>
@@ -190,6 +193,7 @@
                   <div class="ur_title">
                     <span class="title_index"><%= l(:label_question_number,:question_number => pq.question_number) %></span>
                     <%= pq.question_title %>
+                    <span class="title_index">[多行主观]</span>
                     <% if pq.is_necessary == 1 %>
                         <span class="ur_required" title="<%= l(:label_must_answer) %>">*</span>
                     <% end %>

From ade07203312286e6f207bb6b76ad2060fbb6a1f9 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Sat, 17 Jan 2015 14:19:54 +0800
Subject: [PATCH 095/142] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E9=87=8D=E7=BD=AE=20Signed-off-by:=20alan=20?=
 =?UTF-8?q?<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb  |  4 +++-
 app/models/mailer.rb                 | 24 ++++++++++++++++--------
 app/views/layouts/mailer.html.erb    |  2 +-
 app/views/mailer/_issue.html.erb     | 25 ++++++++++++++-----------
 app/views/mailer/_issue.text.erb     |  7 ++++---
 app/views/mailer/issue_add.text.erb  | 11 +----------
 app/views/mailer/issue_edit.html.erb |  6 ++++--
 app/views/mailer/issue_edit.text.erb |  6 ++++--
 8 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ee8711e7e..58af43da3 100644
--- 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
@@ -30,7 +32,7 @@ class UsersController < ApplicationController
   #Ended by young
 
   # edit
-  before_filter :auth_login1, :only => [:show]
+
   #
   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,
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index bee0640da..72e60a0bf 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -105,18 +105,18 @@ class Mailer < ActionMailer::Base
 
     @author = issue.author
     @issue = issue
+    user = User.find_by_mail(recipients)
 
-
-    token = Token.new(:user => User.find_by_mail(recipients), :action => 'autologin')
+    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(:controller  => 'users', :action => 'show', :id => issue.author_id,  :token => @token.value)
+     @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(:controller  => 'my', :action => 'account', :user => User.find_by_mail(recipients) ,  :token => @token.value)
- #
+
+      @user_url = url_for(my_account_url(user,:token => @token.value))
 
     cc = issue.watcher_recipients - issue.recipients
     subject = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] (#{issue.status.name}) #{issue.subject}"
@@ -149,10 +149,18 @@ class Mailer < ActionMailer::Base
     references issue
     @author = journal.user
 
+    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))
 
-      token = Token.new(:user => User.find_by_mail(recipients), :action => 'autologin')
-      token.save
-      @token = token
       @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id, :anchor => "change-#{journal.id}", :token => @token.value)
 
 
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index de7f4a837..aa43b9194 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -14,7 +14,7 @@ ol,ul,li{ list-style-type:none}
 .cl{ clear:both; overflow:hidden; }
 a{ text-decoration:none; }
 a:hover{ text-decoration:underline; }
-
+.mail_box,ul,li{ list-style-type:none}
 .mail{ width:600px; margin:20px; height:auto; color:#4b4b4b; font-size:14px; }
 .mail a{color:#1b55a7; font-weight: bold; }
 .mail_content{ margin-top:30px;}
diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb
index 326a21aaa..c5e136dfc 100644
--- a/app/views/mailer/_issue.html.erb
+++ b/app/views/mailer/_issue.html.erb
@@ -6,23 +6,26 @@
   <span class="c_blue"><%= link_to(h("#{@issue.project.name}"),@project_url) %></span>中有了一个与您相关的最新活动，请您关注！</p>
 <div class="mail_box">
 <ul>
-	<li><strong>标题：</strong><%= link_to(issue.subject, issue_url) %></li>
-	<li><strong>来源：</strong><%= link_to(h("#{issue.project.name}"),@project_url) %><b>|&nbsp;</b>项目缺陷</li>
-	<li><strong style="float:left;">内容：</strong>
-                    	<p class="mail_box_p"><%= textilizable(issue, :description, :only_path => false) %></p>
+	<li style="list-style-type:none"><span style="float: left"><strong>标题：</strong></span><span style="float: left; width: 500px"><%= link_to(issue.subject, issue_url) %></span></li>
+	<li style="list-style-type:none"><span style="float: left"> <strong>来源：</strong></span><span style="float: left; width: 500px"><%= issue.project.name %><b>|&nbsp;</b>项目缺陷</span></li>
+	<li style="list-style-type:none"><span style="float: left"> <strong >内容：</strong></span><span style="float: left; width: 500px">
+                    	<%= issue.description %></span>
     </li>
-  <li><strong style="float:left;">附件：</strong>
-    <p class="mail_fujian">
-      <% unless @issue.attachments.nil? %>
+  <li style="list-style-type:none">
+
+    <% unless @issue.attachments.nil? %>
+     <span style="float: left"> <strong>附件：</strong>
+            </span><span style="float: left; width: 500px">
           <% @issue.attachments.each do |attach| %>
-          <%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %><%= l(:label_added) %></br>
-      <% end %>
+          <p><%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %></p>
+      <% end %></span>
     <% end %>
 
-    </p>
+
   </li>
 </ul>
-  <label  class="mail_reply"><%= link_to( "我要回复", issue_url) %></label>
+  <div class="cl"></div>
+  <label  class="mail_reply"><%= link_to( "我要回复", issue_url,  :class => "mail_reply") %></label>
   <div class="cl"></div>
 </div>
 <!-- <li><%#=l(:field_author)%>: <%#=h issue.author %></li>
diff --git a/app/views/mailer/_issue.text.erb b/app/views/mailer/_issue.text.erb
index 6be5544b8..ae80a3fe0 100644
--- a/app/views/mailer/_issue.text.erb
+++ b/app/views/mailer/_issue.text.erb
@@ -3,12 +3,13 @@
      在
  <%= link_to(h("#{@issue.project.name}"),@project_url) %>中有了一个与您相关的最新活动，请您关注！
 标题：<%= link_to(issue.subject, issue_url) %>
-  来源：<%= link_to(h("#{issue.project.name}"),@project_url) %>|&nbsp;项目缺陷<
+  来源：<%= issue.project.name %>|&nbsp;项目缺陷<
  内容：
-     <%= textilizable(issue, :description, :only_path => false) %>
+     <%= issue.description %>
+        <% unless @issue.attachments.nil? %>
  附件：
 
-        <% unless @issue.attachments.nil? %>
+
             <% @issue.attachments.each do |attach| %>
                 <%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %><%= l(:label_added) %>
             <% end %>
diff --git a/app/views/mailer/issue_add.text.erb b/app/views/mailer/issue_add.text.erb
index 07411a134..b50a39260 100644
--- a/app/views/mailer/issue_add.text.erb
+++ b/app/views/mailer/issue_add.text.erb
@@ -1,11 +1,2 @@
-<%= link_to(h("#{@issue.author}"+"(#{@issue.author_id.firstname+@issue.author_id.lastname})"), @issue_author_url) %>在<%= link_to(h("#{@issue.project.name}"),@project_url) %>
-<%#= l(:text_issue_added, :id => "##{@issue.project_index}", :author => @issue.author) %> !-->
+
 <%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
-<% @issue.attachments.each do |attach| %>
-     <%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %> <%= l(:label_added) %>
-<% end %>
-
-----------------------------------------
-<%= link_to( "我要回复", @issue_url) %>
- <%#=  render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
-
diff --git a/app/views/mailer/issue_edit.html.erb b/app/views/mailer/issue_edit.html.erb
index 8af66d891..3cbd1b02a 100644
--- a/app/views/mailer/issue_edit.html.erb
+++ b/app/views/mailer/issue_edit.html.erb
@@ -2,10 +2,12 @@
 
 <ul>
 <% details_to_strings(@journal.details, false, :only_path => false, :token => @token.value).each do |string| %>
-  <li><%= string %></li>
+      <% if (!string.include? l(:label_attachment)) && (!string.include? "attachments")  %>
+        <li><%= string %></li>
+  <% end %>
 <% end %>
 </ul>
 
-<%= textilizable(@journal, :notes, :only_path => false) %>
+<span style="float: left"><strong><%= l(:field_content)%>：</strong></span><span style="float: left; width: 540px"><%= @journal.notes %></span>
 <hr />
 <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
diff --git a/app/views/mailer/issue_edit.text.erb b/app/views/mailer/issue_edit.text.erb
index a5614595c..5b93b6fe0 100644
--- a/app/views/mailer/issue_edit.text.erb
+++ b/app/views/mailer/issue_edit.text.erb
@@ -1,11 +1,13 @@
 <%= l(:text_issue_updated, :id => "##{@issue.project_index}", :author => @journal.user) %>
 
 <% details_to_strings(@journal.details, true, :token => @token.value).each do |string| -%>
-<%= string %>
+    <% if (!string.include? l(:label_attachment)) && (!string.include? "attachments")  %>
+        <li><%= string %></li>
+    <% end %>
 <% end -%>
 
 <% if @journal.notes? -%>
-<%= @journal.notes %>
+    <%= l(:field_content)%>：<%= @journal.notes %>
 
 <% end -%>
 ----------------------------------------

From ebf63b9ba2e2f355fa85c7eea71da174fc8e124e Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Sat, 17 Jan 2015 14:31:56 +0800
Subject: [PATCH 096/142] Signed-off-by: alan <547533434@qq.com>

---
 app/views/mailer/_issue.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb
index c5e136dfc..5979877a3 100644
--- a/app/views/mailer/_issue.html.erb
+++ b/app/views/mailer/_issue.html.erb
@@ -7,7 +7,7 @@
 <div class="mail_box">
 <ul>
 	<li style="list-style-type:none"><span style="float: left"><strong>标题：</strong></span><span style="float: left; width: 500px"><%= link_to(issue.subject, issue_url) %></span></li>
-	<li style="list-style-type:none"><span style="float: left"> <strong>来源：</strong></span><span style="float: left; width: 500px"><%= issue.project.name %><b>|&nbsp;</b>项目缺陷</span></li>
+	<li style="list-style-type:none"><span style="float: left"> <strong>来源：</strong></span><span style="float: left; width: 500px"><%= issue.project.name %><b>|&nbsp;</b>项目<%= issue.tracker.name%></span></li>
 	<li style="list-style-type:none"><span style="float: left"> <strong >内容：</strong></span><span style="float: left; width: 500px">
                     	<%= issue.description %></span>
     </li>

From 155d48b7cb6ba68f3043e7ed176f765c443b0617 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 17 Jan 2015 14:41:33 +0800
Subject: [PATCH 097/142] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=AF=8F=E9=A1=B5=E6=98=BE=E7=A4=BA20=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 8385b0fde..739adfe1c 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -12,7 +12,7 @@ class PollController < ApplicationController
       else
         polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id} and polls_status = 2")
       end
-      @polls = paginateHelper polls,10 #分页
+      @polls = paginateHelper polls,20 #分页
       respond_to do |format|
         format.html{render :layout => 'base_courses'}
       end

From 2c6e53b9351b2ec239a48c0fa2763a9af0bd2224 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 17 Jan 2015 14:43:55 +0800
Subject: [PATCH 098/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E6=A1=86=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index 49e04a3ba..aa5a0eca8 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -58,7 +58,7 @@
       function poll_submit()
       {
           $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { poll: @poll}) %>');
-          showModal('ajax-modal', '310px');
+          showModal('ajax-modal', '315px');
           $('#ajax-modal').css('height','100px');
           $('#ajax-modal').siblings().remove();
           $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +

From 989ff4fcbea9edb55ff59521bb8a3f8c1acfd4d3 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 17 Jan 2015 14:46:49 +0800
Subject: [PATCH 099/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E6=A1=86=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll_form.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index aa5a0eca8..bbf71e0ce 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -58,8 +58,8 @@
       function poll_submit()
       {
           $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { poll: @poll}) %>');
-          showModal('ajax-modal', '315px');
-          $('#ajax-modal').css('height','100px');
+          showModal('ajax-modal', '310px');
+          $('#ajax-modal').css('height','110px');
           $('#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>");

From e8cca08f40b3df68a76c512f72e9541a2764b136 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 17 Jan 2015 14:54:19 +0800
Subject: [PATCH 100/142] =?UTF-8?q?=E5=A4=9A=E9=80=89=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8E=BB=E9=87=8D=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/poll_helper.rb           | 9 +++++----
 app/views/poll/_choice_show.html.erb | 6 +++---
 public/stylesheets/polls.css         | 6 +++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/helpers/poll_helper.rb b/app/helpers/poll_helper.rb
index da49219be..17ef02a36 100644
--- a/app/helpers/poll_helper.rb
+++ b/app/helpers/poll_helper.rb
@@ -55,10 +55,11 @@ module PollHelper
     t == 0 ? 0 : format("%.2f", e*100/t)
   end
   
-  # def total_answer
-    # poll_question.poll_votes(distinct a.ID   
-  # 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
diff --git a/app/views/poll/_choice_show.html.erb b/app/views/poll/_choice_show.html.erb
index 16971d5ad..d541386d3 100644
--- a/app/views/poll/_choice_show.html.erb
+++ b/app/views/poll/_choice_show.html.erb
@@ -12,14 +12,14 @@
         <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, @poll.users.count) %>%;" id="choice_percentage_<%= poll_answer.id %>"></span>
+            <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, @poll.users.count) %>%</td>
+          <%= 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"><%= poll_question.poll_votes.count %></td>
+          <td class="td42"><%= total_answer(poll_question.id) %></td>
           <td class="td287">&nbsp; </td>
         </tr>
      </tbody>
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 157eb8388..c4925eda2 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -42,7 +42,7 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
 
 /*问卷页面*/
 .polls_box{ border:1px solid #dcdcdc; padding:15px 30px;}
-.ur_page_title{ font-size:16px;  text-align:center; color:#353535;word-break: break-all; word-wrap: break-word;}
+.ur_page_title{ font-size:16px;  text-align:center; color:#353535; word-break:break-all; word-wrap:break-word;}
 .ur_prefix_content{ color:#656565; text-indent:30px; margin-top:10px; }
 .ur_card{border-top:1px solid #dcdcdc;margin-top:20px; color:#3a3a3a;}
 .ur_title{ padding:20px 0px ; float:left; width:604px; word-break: break-all; word-wrap: break-word;}
@@ -60,8 +60,8 @@ a:hover.ur_button{ background:#0fa9bb; text-decoration:none;}
 .ur_progress_text{ text-align:center; font-size:14px;}
 
 /*问卷结果*/
-.title_index{ color:#62bcd7;}
-.ur_title_result{ padding-top:20px;}
+.title_index{ color:#62bcd7; }
+.ur_title_result{ padding-top:20px; word-break:break-all; word-wrap:break-word;}
 .ur_table_result{ color:#5d5d5d;border-right:1px solid #cbcbcb;border-bottom:1px solid #cbcbcb;}
 .ur_table_result tr td{ border-left:1px solid #cbcbcb;border-top:1px solid #cbcbcb; height:20px;}
 .table_bluebg{ background:#d7e5ee; color:#2f3a40; height:24px;}

From 2f9e658697a74d179b12423e485a3e229183c0c2 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 17 Jan 2015 14:59:43 +0800
Subject: [PATCH 101/142] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E8=B0=83=E6=9F=A5=E6=8C=89=E9=92=AE=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_courses.html.erb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 459fc43af..387a0e4cf 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -276,7 +276,12 @@
 
     <div class="user_underline"></div>
 
-    <div class="user_fans">
+    <div class="polls_btn">
+      <!--<a href="#">问卷调查<span >（12）</span></a>-->
+      <style type="text/css">
+          .polls_btn{ height:33px;border-top:1px solid #15bed1; border-bottom:1px solid #15bed1;border-right:1px solid #cee6e6; width:224px !important; padding:7px 0 0 15px; }
+          .polls_btn a{font-size:14px; color:#444444;font-weight:bold;}
+      </style>
       <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id)%>
     </div>
   </div>

From 750c8d77aa5f30fea4a721b80cc3cfc5f14c1981 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 17 Jan 2015 15:21:18 +0800
Subject: [PATCH 102/142] 11111

---
 app/controllers/courses_controller.rb |  3 +-
 db/schema.rb                          | 50 ---------------------------
 2 files changed, 1 insertion(+), 52 deletions(-)

diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index 9d35b9fb0..edd3f1b9d 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -500,8 +500,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?
diff --git a/db/schema.rb b/db/schema.rb
index f9ea40ae9..2120080a0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -23,18 +23,6 @@ ActiveRecord::Schema.define(:version => 20150114022710) do
   add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
   add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
 
-  create_table "api_keys", :force => true do |t|
-    t.string   "access_token"
-    t.datetime "expires_at"
-    t.integer  "user_id"
-    t.boolean  "active",       :default => true
-    t.datetime "created_at",                     :null => false
-    t.datetime "updated_at",                     :null => false
-  end
-
-  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
-  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
-
   create_table "applied_projects", :force => true do |t|
     t.integer "project_id", :null => false
     t.integer "user_id",    :null => false
@@ -1068,14 +1056,6 @@ ActiveRecord::Schema.define(:version => 20150114022710) do
     t.string   "description"
   end
 
-  create_table "social_groups", :force => true do |t|
-    t.string   "name"
-    t.text     "description"
-    t.integer  "user_id"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-  end
-
   create_table "softapplications", :force => true do |t|
     t.string   "name"
     t.text     "description"
@@ -1291,36 +1271,6 @@ ActiveRecord::Schema.define(:version => 20150114022710) do
   add_index "versions", ["project_id"], :name => "versions_project_id"
   add_index "versions", ["sharing"], :name => "index_versions_on_sharing"
 
-  create_table "voting_choices", :force => true do |t|
-    t.integer  "poll_id",                   :null => false
-    t.string   "text",                      :null => false
-    t.datetime "created_on",                :null => false
-    t.integer  "position",   :default => 1
-  end
-
-  add_index "voting_choices", ["poll_id"], :name => "choices_poll_id"
-
-  create_table "voting_polls", :force => true do |t|
-    t.integer  "project_id", :null => false
-    t.string   "question",   :null => false
-    t.datetime "created_on", :null => false
-    t.boolean  "revote"
-  end
-
-  add_index "voting_polls", ["project_id"], :name => "polls_project_id"
-
-  create_table "voting_votes", :force => true do |t|
-    t.integer  "user_id",    :null => false
-    t.integer  "poll_id",    :null => false
-    t.integer  "choice_id",  :null => false
-    t.datetime "created_on", :null => false
-  end
-
-  add_index "voting_votes", ["choice_id"], :name => "votes_choice_id"
-  add_index "voting_votes", ["poll_id"], :name => "votes_poll_id"
-  add_index "voting_votes", ["user_id", "poll_id"], :name => "votes_user_poll_unique", :unique => true
-  add_index "voting_votes", ["user_id"], :name => "votes_user_id"
-
   create_table "watchers", :force => true do |t|
     t.string  "watchable_type", :default => "", :null => false
     t.integer "watchable_id",   :default => 0,  :null => false

From 00633c8331fe519dcdaf6563a8db954116581efd Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 17 Jan 2015 19:00:32 +0800
Subject: [PATCH 103/142] 1

---
 app/controllers/bids_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index ec2fb7d77..7e5894b83 100644
--- 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

From 0ed39fbcc71eb64faf0d049df39446efb62b4a66 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 19 Jan 2015 10:14:44 +0800
Subject: [PATCH 104/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E7=BC=BA?=
 =?UTF-8?q?=E9=99=B7=20Trustie-Forge#1793=20(=E5=B7=B2=E8=A7=A3=E5=86=B3):?=
 =?UTF-8?q?=20=E7=99=BB=E5=BD=95=E5=B9=B3=E5=8F=B0=E5=90=8E=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=BF=AE=E4=BF=AE=E6=94=B9=E8=B5=84=E6=96=99=EF=BC=8C?=
 =?UTF-8?q?=E5=BD=93=E8=BA=AB=E4=BB=BD=E4=B8=BA=E8=80=81=E5=B8=88=E6=88=96?=
 =?UTF-8?q?=E8=80=85=E5=AD=A6=E7=94=9F=E6=97=B6=EF=BC=9A=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=AD=A6=E6=A0=A1=E5=BC=B9=E5=87=BA=E6=A1=86?=
 =?UTF-8?q?=E9=9D=A0=E5=B7=A6=E5=8E=8B=E7=BA=BF=E6=98=BE=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E5=89=A7=E4=B8=AD=E7=8E=B0=E3=80=8B=20?=
 =?UTF-8?q?=E3=80=8A=20360=E9=A1=B9=E7=9B=AE=EF=BC=8C=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=90=9C=E7=B4=A2=E6=A1=86=E4=B9=B1=E4=BA=86?=
 =?UTF-8?q?=E3=80=8Bbug=20Signed-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/my/account.html.erb              | 2 +-
 app/views/welcome/_search_course.html.erb  | 2 +-
 app/views/welcome/_search_project.html.erb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 597229369..2621d4fa3 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -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">
diff --git a/app/views/welcome/_search_course.html.erb b/app/views/welcome/_search_course.html.erb
index 895f696fb..c3bbd46d8 100644
--- a/app/views/welcome/_search_course.html.erb
+++ b/app/views/welcome/_search_course.html.erb
@@ -47,7 +47,7 @@ form #search_type{
 <%#完了把上面东西放到 .css 里%>
 </style>
 <%= form_tag({controller: :welcome, action: :search }, method: :get) do %>
-<div class="project-search" style="float: right">
+<div class="project-search" style="float: right; width: 260px">
 	<div class='search_widget'>
 		<%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字',  :size => 27, style: "float:left"  %>
 		<%= select_tag(:search_type, options_for_select(select_option), :style => "float:right" ) %>
diff --git a/app/views/welcome/_search_project.html.erb b/app/views/welcome/_search_project.html.erb
index 6a77861b9..1b3552c86 100644
--- a/app/views/welcome/_search_project.html.erb
+++ b/app/views/welcome/_search_project.html.erb
@@ -86,7 +86,7 @@ form #search_by
   }
 </script>
 <%= form_tag({controller: :welcome, action: :search }, method: :get) do %>
-<div class="project-search" style="float: right">
+<div class="project-search" style="float: right; width: 260px">
 	<div class='search_widget' >
 
 		<%= text_field_tag :q, nil, placeholder:'请输入要搜索的关键字', style:"float:left" %>

From 0b0b6c9b6ed15a069f71696ce5e60ecae3b494f6 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 19 Jan 2015 11:01:05 +0800
Subject: [PATCH 105/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E6=89=98?=
 =?UTF-8?q?=E7=AE=A1=E5=B9=B3=E5=8F=B0=E4=B8=AD=E7=82=B9=E5=87=BB=E6=9F=90?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=BF=9B=E5=85=A5=E8=AF=A5=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E4=B8=BB=E9=A1=B5=EF=BC=8C=E5=8F=B3=E4=B8=8A=E8=A7=92=E7=9A=84?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=A4=84=E4=B8=8D=E8=BE=93=E5=85=A5=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E7=82=B9=E5=87=BB=E6=90=9C=E7=B4=A2=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=EF=BC=8C=E7=BB=99=E5=87=BA=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=90=88=E7=90=86=E3=80=8B?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E3=80=8A=E8=AF=BE=E7=A8=8B=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0=E8=BF=9B=E5=85=A5=E6=9F=90=E4=B8=80=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=A3=8E=E6=A0=BC=E4=BF=9D=E6=8C=81=E4=B8=8E?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8F=8A=E7=AB=9E=E8=B5=9B=E7=9A=84=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=E3=80=8B=20Signed-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_courses.html.erb    | 26 +++++++++++++++++++++-
 app/views/layouts/base_newcontest.html.erb |  2 +-
 app/views/layouts/base_projects.html.erb   |  2 +-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 387a0e4cf..f0204f7ee 100644
--- 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>
diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index 8cae51063..0d234a69c 100644
--- 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>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 3937c1822..67e4da0f4 100644
--- 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>

From d5100e4808ebf9cc0de3a60ed4793367cc6d568c Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 19 Jan 2015 11:42:40 +0800
Subject: [PATCH 106/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E8=8B=A5?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B2=A1=E6=9C=89=E5=A1=AB=E5=86=99=E5=A7=93?=
 =?UTF-8?q?=E5=90=8D=E6=88=96=E8=80=85=E5=AD=A6=E5=8F=B7=EF=BC=8C=E5=9C=A8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A4=84=E5=A7=93=E5=90=8D=E5=AD=A6=E5=8F=B7?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=90=88=E7=90=86=E3=80=8Bbug=20Sig?=
 =?UTF-8?q?ned-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_member_list.html.erb       | 40 ++++++++++++-------
 .../courses/_member_list_detail.html.erb      | 38 ++++++++++++------
 2 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/app/views/courses/_member_list.html.erb b/app/views/courses/_member_list.html.erb
index 41b4f41e7..dd543ec2c 100644
--- 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 %>
-                      <li>
-                        <%= l(:label_bidding_user_studentname) %> :
-                        <%= link_to member.user.show_name, user_path(member.user) %>
-                      </li>
-                      </br>
+                      <% 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>
+                          <% end %>
+                          <% 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>
+                          <% end %>
+                      <% end %>
                       <%#= 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 %>
+                      <li>
+                        <%= l(:label_username)%>
+                        <%= link_to(member.user.name, user_path(member.user)) %>
+                      </li>
+                <% end %>
                   <!--teacher's code disapeared  moified by huang-->
 
-                  <% if @canShowCode  %>
-                      <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 %>
+
                 </ul>
                 <% if @subPage_title == l(:label_student_list) %>
                     <%= link_to format("%0.2f",member.score.nil? ? 0 : member.score.to_s), {
diff --git a/app/views/courses/_member_list_detail.html.erb b/app/views/courses/_member_list_detail.html.erb
index f37067cb5..bc6cbd242 100644
--- 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 %>
-            <li>
-              <%= l(:label_bidding_user_studentname) %> :
-              <%= link_to member.user.show_name, user_path(member.user) %>
-
-            </li> </br>
+            <% 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>
+                <% end %>
+                <% 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>
+                <% end %>
+            <% end %>
             <%#= 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>
+              <%= l(:label_username)%>
+              <%= link_to(member.user.name, user_path(member.user)) %>
+            </li>
         <% end %>
         <!--teacher's code disapeared  moified by huang-->
 
-        <% if @canShowCode  %>
-            <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 %>
+
       </ul>
       <% if @subPage_title == l(:label_student_list) %>
           <%= link_to format("%0.2f",member.score.to_s), {

From 3315116832c5f966eac694af27d4756ffec6455f Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 19 Jan 2015 14:35:30 +0800
Subject: [PATCH 107/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B--=E7=95=99=E8=A8=80=EF=BC=9A=E7=BB=99=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E7=95=99=E8=A8=80=E5=8D=B4=E8=BF=94=E5=9B=9E404?=
 =?UTF-8?q?=E3=80=8Bbug=20Signed-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/contest.rb                | 3 ++-
 app/views/layouts/mailer.html.erb    | 2 +-
 app/views/mailer/issue_add.html.erb  | 1 +
 app/views/mailer/issue_add.text.erb  | 1 +
 app/views/mailer/issue_edit.html.erb | 2 ++
 app/views/mailer/issue_edit.text.erb | 2 ++
 6 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/models/contest.rb b/app/models/contest.rb
index ad54e8fb4..650e363a8 100644
--- a/app/models/contest.rb
+++ b/app/models/contest.rb
@@ -15,7 +15,8 @@ class Contest < ActiveRecord::Base
   has_many :praise_tread, as: :praise_tread_object, dependent: :destroy
   has_many :contestnotifications, :dependent => :destroy, :include => :author
 
-  
+
+
 
   acts_as_attachable
 
diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index aa43b9194..b80206728 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -39,7 +39,7 @@ a:hover.mail_reply{ background:#06a9bc; text-decoration:none;}
         </div><!--mail_head end-->
         <%= yield %>
         <hr />
-        <div class="mail_foot"><%= link_to("退订该邮件？", @user_url)  %> </div><!--mail_foot end-->
+      <span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %></span><!--mail_foot end-->
     </div>
   </div>
 </body>
diff --git a/app/views/mailer/issue_add.html.erb b/app/views/mailer/issue_add.html.erb
index f51dad121..4db0113b9 100644
--- a/app/views/mailer/issue_add.html.erb
+++ b/app/views/mailer/issue_add.html.erb
@@ -5,4 +5,5 @@
 
 
 </div>
+<div class="mail_foot"><%= link_to("退订该邮件？", @user_url)  %> </div>
 
diff --git a/app/views/mailer/issue_add.text.erb b/app/views/mailer/issue_add.text.erb
index b50a39260..31d9632db 100644
--- a/app/views/mailer/issue_add.text.erb
+++ b/app/views/mailer/issue_add.text.erb
@@ -1,2 +1,3 @@
 
 <%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
+<%= link_to("退订该邮件？", @user_url)  %>
\ No newline at end of file
diff --git a/app/views/mailer/issue_edit.html.erb b/app/views/mailer/issue_edit.html.erb
index 3cbd1b02a..0c46b5e60 100644
--- a/app/views/mailer/issue_edit.html.erb
+++ b/app/views/mailer/issue_edit.html.erb
@@ -11,3 +11,5 @@
 <span style="float: left"><strong><%= l(:field_content)%>：</strong></span><span style="float: left; width: 540px"><%= @journal.notes %></span>
 <hr />
 <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
+<div class="mail_foot"><%= link_to("退订该邮件？", @user_url)  %> </div>
+
diff --git a/app/views/mailer/issue_edit.text.erb b/app/views/mailer/issue_edit.text.erb
index 5b93b6fe0..70e4186c4 100644
--- a/app/views/mailer/issue_edit.text.erb
+++ b/app/views/mailer/issue_edit.text.erb
@@ -12,3 +12,5 @@
 <% end -%>
 ----------------------------------------
 <%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
+
+<%= link_to("退订该邮件？", @user_url)  %>
\ No newline at end of file

From abcf06ccc7cbd8e14713c7670247834c0ccd2f35 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Mon, 19 Jan 2015 15:00:46 +0800
Subject: [PATCH 108/142] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=BC=95=E7=94=A8=E9=97=AE=E9=A2=98=E3=80=82?=
 =?UTF-8?q?=E5=8E=9F=E5=9B=A0=EF=BC=9A15=E5=B9=B41-3=E6=9C=88=E8=83=BD?=
 =?UTF-8?q?=E5=B1=9E=E4=BA=8E2014=E5=B9=B4=E7=A7=8B=E5=AD=A3=E5=AD=A6?=
 =?UTF-8?q?=E6=9C=9F=EF=BC=8C=E4=BB=A3=E7=A0=81=E5=8D=B4=E5=B0=86=E5=85=B6?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=B8=BA15=E5=B9=B4=E7=A7=8B=E5=AD=A3?=
 =?UTF-8?q?=E5=AD=A6=E6=9C=9F=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/courses_helper.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index a862753ef..411de1dcf 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -561,12 +561,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

From 493b7ca695f7666f8a5edd8ebbd7096bbce268a0 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Mon, 19 Jan 2015 16:05:18 +0800
Subject: [PATCH 109/142] =?UTF-8?q?#1821=20=E8=AF=BE=E7=A8=8B--=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=EF=BC=9A=E5=AF=BC=E5=87=BAexcel=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/locales/zh.yml               | 2 +-
 public/stylesheets/course_group.css | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index ac7c52fe2..681dfadc1 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2110,7 +2110,7 @@ zh:
   excel_homework_list: 作品列表
   excel_been_rated: 已评
   excel_not_rated: 未评
-  label_export_excel: 导出Excel
+  label_export_excel: 导出列表
 
   label_softapplication: 应用软件
   label_attending_contest: 参加竞赛
diff --git a/public/stylesheets/course_group.css b/public/stylesheets/course_group.css
index 71f870a9a..b6c7f4f8c 100644
--- a/public/stylesheets/course_group.css
+++ b/public/stylesheets/course_group.css
@@ -41,8 +41,9 @@ input.f_2 {
 .st_search{ margin:10px 0;}
 .st_search span{ font-size:14px; font-weight:bold; color:#606060; margin-right:35px;}
 .st_search input{ border:1px solid #1c9ec7;  height:20px;  width:200px;}
- a:hover.xls{ background: url('../images/icon_excel.gif') no-repeat scroll 1px 50% transparent !important;
-    padding: 2px 0px 3px 16px;
+ a:hover.xls{ /*background: url('../images/icon_excel.gif') no-repeat scroll 1px 50% transparent !important;*/
+    /*padding: 2px 0px 3px 16px;*/
+    background:#ffffff !important;
     font-family:微软雅黑 !important;
     font-size: 12px !important;
     color: #136b3b !important;

From 14a1f31a1270eaef0bbaa6211026dccf203fc9cf Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Mon, 19 Jan 2015 16:43:21 +0800
Subject: [PATCH 110/142] =?UTF-8?q?1=E3=80=81=E9=A1=B9=E7=9B=AE=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=20->=20=E8=BF=91=E6=9C=9F=E5=8A=A8=E6=80=81=202?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=BB=BA=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=97=B6=EF=BC=8C=E6=8F=8F=E8=BF=B0=E4=BC=9A?=
 =?UTF-8?q?=E6=9C=89=E4=B8=80=E8=A1=8C=E7=A9=BA=E7=99=BD=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_course_form.html.erb | 4 +---
 config/locales/zh.yml                   | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/views/courses/_course_form.html.erb b/app/views/courses/_course_form.html.erb
index c48d24935..d293f9ed1 100644
--- a/app/views/courses/_course_form.html.erb
+++ b/app/views/courses/_course_form.html.erb
@@ -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;">
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index ac7c52fe2..061baa932 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -748,7 +748,7 @@ zh:
   label_news_view_all: 查看所有新闻
   label_news_added: 新闻已添加
   label_settings: 配置
-  label_overview: 项目动态
+  label_overview: 近期动态
   label_course_overview: "课程动态"
   label_question_student: 作业交流 #bai
   label_homework_commit: 提交作业 #huang

From 7b9d88ecfeefd465be895efb398d961e6782be8b Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 20 Jan 2015 11:42:28 +0800
Subject: [PATCH 111/142] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=87=8D=E6=96=B0=E5=8F=91=E5=B8=83=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb   | 20 +++++++++++--
 app/views/poll/_poll.html.erb        | 43 ++++++++++++++++++++++++++++
 app/views/poll/index.html.erb        | 39 +------------------------
 app/views/poll/republish_poll.js.erb |  1 +
 config/routes.rb                     |  1 +
 5 files changed, 63 insertions(+), 41 deletions(-)
 create mode 100644 app/views/poll/_poll.html.erb
 create mode 100644 app/views/poll/republish_poll.js.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 739adfe1c..6890b8dd7 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -1,8 +1,8 @@
 class PollController < ApplicationController
-  before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll,:commit_answer,:publish_poll]
+  before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll,:commit_answer,:publish_poll,:republish_poll]
   before_filter :find_container, :only => [:new,:create, :index]
   before_filter :is_member_of_course, :only => [:index,:show]
-  before_filter :is_course_teacher, :only => [:new,:create,:edit,:update,:destroy,:publish_poll]
+  before_filter :is_course_teacher, :only => [:new,:create,:edit,:update,:destroy,:publish_poll,:republish_poll]
   include PollHelper
   def index
     if @course
@@ -311,6 +311,19 @@ class PollController < ApplicationController
     end
   end
 
+  #重新发布问卷
+  def republish_poll
+    @poll.poll_questions.each do |poll_question|
+      poll_question.poll_votes.destroy_all
+    end
+    @poll.poll_users.destroy_all
+    @poll.polls_status = 1
+    @poll.save
+    respond_to do |format|
+      format.js
+    end
+  end
+
   private
   def find_poll_and_course
     @poll = Poll.find params[:id]
@@ -337,7 +350,8 @@ class PollController < ApplicationController
   end
 
   def is_course_teacher
-    render_403 unless(@course && User.current.allowed_to?(:as_teacher,@course))
+    @is_teacher = User.current.allowed_to?(:as_teacher,@course)
+    render_403 unless(@course && @is_teacher)
   end
 
   #获取未完成的题目
diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb
new file mode 100644
index 000000000..8ae766516
--- /dev/null
+++ b/app/views/poll/_poll.html.erb
@@ -0,0 +1,43 @@
+<li title="<%= poll.polls_name %>">
+  <% if @is_teacher %>
+      <% if has_commit_poll?(poll.id ,User.current) %>
+          <sapn class="polls_title fl"> <%= poll.polls_name %></sapn>
+      <% else %>
+          <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
+      <% end %>
+  <% else %>
+      <% if has_commit_poll?(poll.id ,User.current) && poll.polls_status == 2 %>
+          <sapn class="polls_title fl" >
+            <%= poll.polls_name %>
+          </sapn>
+      <% elsif (!has_commit_poll?(poll.id ,User.current)) && poll.polls_status == 2 %>
+          <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
+      <% end %>
+  <% end %>
+</li>
+<li>
+  <%if @is_teacher && poll.polls_status == 2%>
+      <%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fl ml10"%>
+  <% 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 && poll.polls_status == 1%>
+      <!--新建状态的问卷可编辑-->
+      <%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml20"%>
+  <% end%>
+</li>
+<li>
+  <% if @is_teacher && poll.polls_status == 2%>
+    <%= link_to "重新发布", republish_poll_poll_path(poll.id), :remote => true, :class => 'polls_de fr ml20'  %>
+  <% end %>
+</li>
+<li class="polls_date fr">
+  <%= format_time poll.created_at%>
+</li>
\ No newline at end of file
diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index e57674c7a..fa378fc7b 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -12,44 +12,7 @@
   <div class="polls_list">
     <% @polls.each do |poll|%>
         <ul id="polls_<%= poll.id %>">
-          <li title="<%= poll.polls_name %>">
-            <% if @is_teacher %>
-                <% if has_commit_poll?(poll.id ,User.current) %>
-                    <sapn class="polls_title fl"> <%= poll.polls_name %></sapn>
-                <% else %>
-                    <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
-                <% end %>
-            <% else %>
-                <% if has_commit_poll?(poll.id ,User.current) && poll.polls_status == 2 %>
-                    <sapn class="polls_title fl" >
-                      <%= poll.polls_name %>
-                    </sapn>
-                <% elsif (!has_commit_poll?(poll.id ,User.current)) && poll.polls_status == 2 %>
-                    <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
-                <% end %>
-            <% end %>
-          </li>
-          <li>
-            <%if @is_teacher && poll.polls_status == 2%>
-                <%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fl ml10"%>
-            <% 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 && poll.polls_status == 1%>
-                <!--新建状态的问卷可编辑-->
-                <%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml20"%>
-            <% end%>
-          </li>
-          <li class="polls_date fr">
-            <%= format_time poll.created_at%>
-          </li>
+          <%= render :partial => 'poll', :locals => {:poll => poll} %>
         </ul>
         <div class="cl"></div>
     <% end%>
diff --git a/app/views/poll/republish_poll.js.erb b/app/views/poll/republish_poll.js.erb
new file mode 100644
index 000000000..a7399af5b
--- /dev/null
+++ b/app/views/poll/republish_poll.js.erb
@@ -0,0 +1 @@
+$("#polls_<%= @poll.id %>").html("<%= escape_javascript(render :partial => 'poll',:locals => {:poll => @poll}) %>");
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index bd1b27dee..67b0118b0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -65,6 +65,7 @@ RedmineApp::Application.routes.draw do
       post 'create_poll_question'
       post 'commit_poll'
       get 'publish_poll'
+      get 'republish_poll'
     end
     collection do
       delete 'delete_poll_question'

From 40d6c3b19cdb06be75220d60f9669ae592941681 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Tue, 20 Jan 2015 16:33:59 +0800
Subject: [PATCH 112/142] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E3=80=8A=E9=82=AE?=
 =?UTF-8?q?=E7=AE=B1=E5=9C=B0=E5=9D=80=E9=AA=8C=E8=AF=81=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8=E5=8F=8A=E5=9B=BD=E9=99=85=E5=8C=96=E7=9A=84?=
 =?UTF-8?q?=E7=BC=96=E5=86=99=E3=80=8B=E5=8A=9F=E8=83=BD=20Signed-off-by:?=
 =?UTF-8?q?=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gemfile                               |  4 +++-
 app/controllers/account_controller.rb |  3 +++
 app/models/user.rb                    |  2 +-
 config/application.rb                 |  5 +++++
 config/environments/development.rb    |  2 +-
 config/locales/en.yml                 | 11 +++++++++++
 config/locales/zh.yml                 | 17 +++++++++++++++++
 7 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 6c2101345..5045cb822 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,6 +18,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 'better_errors', path: 'lib/better_errors'
@@ -51,7 +52,8 @@ group :development, :test do
 	gem 'ruby-prof', '~> 0.15.1' unless RUBY_PLATFORM =~ /w32/
 	gem 'pry'
 	gem 'pry-nav'
-
+  gem 'rspec-rails' , '2.13.1'
+  gem 'guard-rspec','2.5.0'
 end
 
 
diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 6c95294d7..69c2d3002 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -345,7 +345,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?
diff --git a/app/models/user.rb b/app/models/user.rb
index 52619b038..bef65fe54 100644
--- 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
diff --git a/config/application.rb b/config/application.rb
index d37a9eae2..716e3875d 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -16,6 +16,11 @@ module RedmineApp
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
 
+    # verifier if email is real
+    EmailVerifier.config do |config|
+      config.verifier_email = "lizanle521@126.com"
+    end
+
     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths += %W(#{config.root}/lib)
 
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 9d3cbf244..8bec9789c 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -13,7 +13,7 @@ RedmineApp::Application.configure do
   config.action_controller.perform_caching             = false
 
   # Don't care if the mailer can't send
-  config.action_mailer.raise_delivery_errors = false
+  config.action_mailer.raise_delivery_errors = true
 
   config.active_support.deprecation = :log
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index dd79a546c..d25ba6ae2 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -71,6 +71,14 @@ en:
         one:   "almost 1 year"
         other: "almost %{count} years"
 
+  errors:
+      messages:
+        email_verifier:
+          email_not_real: must point to a real mail account
+          out_of_mail_server: appears to point to dead mail server
+          no_mail_server: appears to point to domain which doesn't handle e-mail
+          failure: could not be checked if is real
+          exception: could not be sent
   number:
     format:
       separator: "."
@@ -130,6 +138,9 @@ en:
         circular_dependency: "This relation would create a circular dependency"
         cant_link_an_issue_with_a_descendant: "An issue cannot be linked to one of its subtasks"
 
+
+
+
   actionview_instancetag_blank_option: Please select
 
   attachment_all: "All"
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index ac7c52fe2..ea045f29b 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2,6 +2,10 @@
 # Chinese (China) translations for Ruby on Rails
 # by tsechingho (http://github.com/tsechingho)
 zh:
+
+
+
+
   # Text direction: Left-to-Right (ltr) or Right-to-Left (rtl)
   direction: ltr
   jquery:
@@ -30,6 +34,17 @@ zh:
       - :month
       - :day
 
+
+  errors:
+    messages:
+       email_verifier:
+         email_not_real: 必须指定一个真实的邮箱地址
+         out_of_mail_server: 指向了一个已停用的邮箱服务器
+         no_mail_server: 域名地址没有邮件功能
+         failure: 邮箱地址不能被验证
+         exception: 邮箱不能发送成功
+
+
   time:
     formats:
       default: "%Y年%b%d日 %A %H:%M:%S"
@@ -138,6 +153,8 @@ zh:
         circular_dependency: "此关联将导致循环依赖"
         cant_link_an_issue_with_a_descendant: "问题不能关联到它的子任务"
 
+
+
   actionview_instancetag_blank_option: 请选择
 
   attachment_all: "全部"

From 77cb2b08934bc5569c0e702db6ab06978665808f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 20 Jan 2015 16:50:16 +0800
Subject: [PATCH 113/142] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E5=B7=B2=E5=AE=8C=E6=88=90=E7=9A=84=E9=97=AE=E5=8D=B7=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E8=BF=87=E9=95=BF=E6=97=B6=E6=98=BE=E7=A4=BA=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=202.=E5=A2=9E=E5=8A=A0=E5=8F=96=E6=B6=88=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E6=97=B6=E7=9A=84=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll.html.erb           |  4 ++-
 app/views/poll/_poll_republish.html.erb | 44 +++++++++++++++++++++++++
 app/views/poll/index.html.erb           | 27 +++++++++++++++
 public/stylesheets/polls.css            |  2 +-
 4 files changed, 75 insertions(+), 2 deletions(-)
 create mode 100644 app/views/poll/_poll_republish.html.erb

diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb
index 8ae766516..dea4e175b 100644
--- a/app/views/poll/_poll.html.erb
+++ b/app/views/poll/_poll.html.erb
@@ -35,7 +35,9 @@
 </li>
 <li>
   <% if @is_teacher && poll.polls_status == 2%>
-    <%= link_to "重新发布", republish_poll_poll_path(poll.id), :remote => true, :class => 'polls_de fr ml20'  %>
+    <a class="polls_de fr ml20" onclick="republish_poll(<%= poll.id%>);">
+      取消发布
+    </a>
   <% end %>
 </li>
 <li class="polls_date fr">
diff --git a/app/views/poll/_poll_republish.html.erb b/app/views/poll/_poll_republish.html.erb
new file mode 100644
index 000000000..3688ba883
--- /dev/null
+++ b/app/views/poll/_poll_republish.html.erb
@@ -0,0 +1,44 @@
+<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 clickPublishPoll()
+      {
+          hideModal("#popbox02");
+          $.ajax({
+              type: "GET",
+              url: "<%= publish_poll_poll_path(poll.id)%>",
+              data: 'text',
+              success: function (data) {
+
+              }
+          });
+      }
+      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>
+
diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index fa378fc7b..043e6898b 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -1,4 +1,31 @@
 <%= stylesheet_link_tag  'polls', :media => 'all' %>
+<script type="text/javascript">
+    function republish_poll(poll_id)
+    {
+        $('#ajax-modal').html("<div id='popbox02'>" +
+            "<div class='upload_con'>" +
+                "<div class='upload_box'>" +
+                    "<p class='polls_box_p'>取消发布后问卷统计结果将会被清空<br />是否确定取消发布该问卷？</p>" +
+                    "<div class='polls_btn_box'>" +
+                        "<a href='/poll/"+ poll_id +"/republish_poll' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" +
+                        "<a class='upload_btn upload_btn_grey' onclick='clickCanel();'>取&nbsp;&nbsp;消</a>" +
+                    "</div>" +
+                    "<div class='cl'></div>" +
+                "</div>" +
+            "</div>" +
+        "</div>");
+        showModal('ajax-modal', '310px');
+        $('#ajax-modal').css('height','110px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+            "<a 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");
+    }
+
+    function clickCanel(){hideModal("#popbox02");}
+</script>
 <div class="polls_content" id="polls" style="width:677px;">
   <div class="polls_head">
     <h2>所有问卷
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 58ae913b0..4141164c4 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -27,7 +27,7 @@ a.newbtn{ float:right; display:block; width:80px; height:30px; background:#64bdd
 a:hover.newbtn{ background:#55a1b9; text-decoration:none;}
 .polls_list ul{ padding-left:10px; border-bottom:1px dashed #c9c9c9; height:32px; padding-top:8px;}
 a.polls_title{ font-weight:bold; color:#3e6d8e;max-width: 350px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
-.polls_title{ font-weight:bold; color:#3e6d8e;}
+.polls_title{ font-weight:bold; color:#3e6d8e;max-width: 350px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
 a.pollsbtn{ display:block; width:66px; height:22px; text-align:center; border:1px solid #64bdd9; color:#64bdd9;}
 a:hover.pollsbtn{ background:#64bdd9; color:#fff; text-decoration:none;}
 .polls_date{  color:#666666;}

From f3062da237ba7a010bc708a1a119a3ab4149b93c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 21 Jan 2015 09:18:29 +0800
Subject: [PATCH 114/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A9=BA=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=97=B6=EF=BC=8C=E8=AF=BE=E7=A8=8B=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=8A=A0=E8=BD=BD(=E5=B1=85=E7=84=B6?=
 =?UTF-8?q?=E6=98=AF=E6=AD=BB=E5=BE=AA=E7=8E=AF=E3=80=82=E3=80=82=E3=80=82?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/welcome/course.html.erb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index 927734b24..d427a9aea 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -122,6 +122,7 @@
               else
                   course_term = "春季学期"
               end%>
+              <%break if Time.new.strftime("%Y").to_i - year_now >= 2%>
               <% all_new_hot_course += find_all_new_hot_course(course_count-all_new_hot_course.count, @school_id, year_now, course_term)%>
           <% end%>
           <%= render :partial => 'course_list', :locals => {:course_list => all_new_hot_course} %>
@@ -152,6 +153,7 @@
                    else
                       course_term = "春季学期"
                   end%>
+                  <%break if Time.new.strftime("%Y").to_i - year_now >= 2%>
                   <% all_new_hot_course += find_all_new_hot_course(9-(all_new_hot_course.count + cur_school_course.count), @school_id, year_now, course_term)%>
               <% end%>
               <%= render :partial => 'course_list', :locals => {:course_list => all_new_hot_course} %>

From 402dfc788fbd5840a34984eb7f942f013de2d08d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 21 Jan 2015 09:55:40 +0800
Subject: [PATCH 115/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E6=97=B6=E9=97=AE=E5=8D=B7=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb | 2 +-
 app/views/poll/_show_head.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 6890b8dd7..2fc586711 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -40,7 +40,7 @@ class PollController < ApplicationController
   def new
     if @course
       option = {
-          :polls_name => l(:label_poll_new),
+          :polls_name => "",
           :polls_type => @course.class.to_s,
           :polls_group_id => @course.id,
           :polls_status => 1,
diff --git a/app/views/poll/_show_head.html.erb b/app/views/poll/_show_head.html.erb
index ce74dc10a..7ab16b24d 100644
--- a/app/views/poll/_show_head.html.erb
+++ b/app/views/poll/_show_head.html.erb
@@ -1,7 +1,7 @@
 <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%>
+    <%= poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%>
   </h1>
   <p class="ur_prefix_content" id="polls_description_p">
     <%= @poll.polls_description%>

From 3bdaeb20c217bac98a682aa3b88ecb1dbd7536c3 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 21 Jan 2015 11:14:01 +0800
Subject: [PATCH 116/142] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=202=E3=80=81=E9=97=AE=E5=8D=B7=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=8F=91=E5=B8=83=E9=97=AE=E5=8D=B7=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=203=E3=80=81=E5=A2=9E=E5=8A=A0js=E8=BF=94=E5=9B=9E=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=204=E3=80=81=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84js=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb      |  8 +++-
 app/views/poll/_poll.html.erb           | 64 +++++++++++++++++--------
 app/views/poll/_poll_form.html.erb      |  2 +-
 app/views/poll/_poll_republish.html.erb | 12 -----
 app/views/poll/_poll_submit.html.erb    | 16 +------
 app/views/poll/index.html.erb           | 24 ++++++++++
 app/views/poll/publish_poll.js.erb      |  2 +
 app/views/poll/republish_poll.js.erb    |  3 +-
 public/stylesheets/polls.css            | 15 +++++-
 9 files changed, 94 insertions(+), 52 deletions(-)
 create mode 100644 app/views/poll/publish_poll.js.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 2fc586711..42ab98e10 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -187,7 +187,13 @@ class PollController < ApplicationController
     @poll.polls_status = 2
     @poll.published_at = Time.now
     if @poll.save
-      redirect_to poll_index_url(:polls_type => "Course", :polls_group_id => @course.id)
+      if params[:is_remote]
+        redirect_to poll_index_url(:polls_type => "Course", :polls_group_id => @course.id)
+      else
+        respond_to do |format|
+          format.js
+        end
+      end
     end
   end
 
diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb
index dea4e175b..cc7e88547 100644
--- a/app/views/poll/_poll.html.erb
+++ b/app/views/poll/_poll.html.erb
@@ -1,23 +1,44 @@
+<% has_commit = has_commit_poll?(poll.id ,User.current)%>
 <li title="<%= poll.polls_name %>">
   <% if @is_teacher %>
-      <% if has_commit_poll?(poll.id ,User.current) %>
-          <sapn class="polls_title fl"> <%= poll.polls_name %></sapn>
+      <% if has_commit %>
+          <sapn class="polls_title fl">
+            <%= poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%>
+          </sapn>
       <% else %>
-          <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
+          <%= link_to (poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name), poll_path(poll.id), :class => "polls_title polls_title_w fl" %>
       <% end %>
   <% else %>
-      <% if has_commit_poll?(poll.id ,User.current) && poll.polls_status == 2 %>
+      <% if has_commit && poll.polls_status == 2 %>
           <sapn class="polls_title fl" >
-            <%= poll.polls_name %>
+            <%= poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name %>
           </sapn>
-      <% elsif (!has_commit_poll?(poll.id ,User.current)) && poll.polls_status == 2 %>
-          <%= link_to poll.polls_name, poll_path(poll.id), :class => "polls_title fl" %>
+      <% elsif !has_commit && poll.polls_status == 2 %>
+          <%= link_to (poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name), poll_path(poll.id), :class => "polls_title polls_title_w fl" %>
       <% 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 && poll.polls_status == 2%>
-      <%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fl ml10"%>
+  <%if @is_teacher %>
+    <% if poll.polls_status == 1 %>
+      <a href="#" class="pollsbtn btn_pu fl ml5" onclick="poll_submit(<%= poll.id%>);">发布问卷</a>
+    <% elsif poll.polls_status == 2%>
+      <a href="#" class="pollsbtn btn_de fl ml5" onclick="republish_poll(<%= poll.id%>);">取消发布</a>
+    <% end%>
   <% end%>
 </li>
 <li>
@@ -28,18 +49,21 @@
   <% end%>
 </li>
 <li>
-  <% if @is_teacher && poll.polls_status == 1%>
-      <!--新建状态的问卷可编辑-->
-      <%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml20"%>
+  <% 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">
+<!--<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>
\ No newline at end of file
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index bbf71e0ce..6ce4137a3 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -57,7 +57,7 @@
 
       function poll_submit()
       {
-          $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { poll: @poll}) %>');
+          $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll},:is_remote => false) %>');
           showModal('ajax-modal', '310px');
           $('#ajax-modal').css('height','110px');
           $('#ajax-modal').siblings().remove();
diff --git a/app/views/poll/_poll_republish.html.erb b/app/views/poll/_poll_republish.html.erb
index 3688ba883..3f93b6b3d 100644
--- a/app/views/poll/_poll_republish.html.erb
+++ b/app/views/poll/_poll_republish.html.erb
@@ -2,18 +2,6 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <script type="text/javascript">
-      function clickPublishPoll()
-      {
-          hideModal("#popbox02");
-          $.ajax({
-              type: "GET",
-              url: "<%= publish_poll_poll_path(poll.id)%>",
-              data: 'text',
-              success: function (data) {
-
-              }
-          });
-      }
       function clickCanel(){hideModal("#popbox02");}
   </script>
 </head>
diff --git a/app/views/poll/_poll_submit.html.erb b/app/views/poll/_poll_submit.html.erb
index cdc41dd9d..af3ca2d42 100644
--- a/app/views/poll/_poll_submit.html.erb
+++ b/app/views/poll/_poll_submit.html.erb
@@ -2,18 +2,6 @@
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <script type="text/javascript">
-      function clickPublishPoll()
-      {
-          hideModal("#popbox02");
-          $.ajax({
-              type: "GET",
-              url: "<%= publish_poll_poll_path(poll.id)%>",
-              data: 'text',
-              success: function (data) {
-
-              }
-          });
-      }
       function clickCanel(){hideModal("#popbox02");}
   </script>
 </head>
@@ -27,16 +15,14 @@
         是否确定发布该问卷？
       </p>
       <div class="polls_btn_box">
-        <%= link_to "确    定",publish_poll_poll_path(poll.id), :class => "upload_btn", :onclick => "clickCanel();" %>
+        <%= 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>
diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index 043e6898b..de30b5deb 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -25,6 +25,30 @@
     }
 
     function clickCanel(){hideModal("#popbox02");}
+
+    function poll_submit(poll_id)
+    {
+        $('#ajax-modal').html("<div id='popbox02'>" +
+            "<div class='upload_con'>" +
+                "<div class='upload_box'>" +
+                    "<p class='polls_box_p'>问卷发布后将不能对问卷进行修改，<br />是否确定发布该问卷？</p>" +
+                    "<div class='polls_btn_box'>" +
+                        "<a href='/poll/"+ poll_id +"/publish_poll' class='upload_btn' onclick='clickCanel();' data-remote='true'>确&nbsp;&nbsp;定</a>" +
+                        "<a class='upload_btn upload_btn_grey' onclick='clickCanel();'>取&nbsp;&nbsp;消</a>" +
+                    "</div>" +
+                    "<div class='cl'></div>" +
+                "</div>" +
+            "</div>" +
+        "</div>");
+        showModal('ajax-modal', '310px');
+        $('#ajax-modal').css('height','110px');
+        $('#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>
 <div class="polls_content" id="polls" style="width:677px;">
   <div class="polls_head">
diff --git a/app/views/poll/publish_poll.js.erb b/app/views/poll/publish_poll.js.erb
new file mode 100644
index 000000000..ad052f8f2
--- /dev/null
+++ b/app/views/poll/publish_poll.js.erb
@@ -0,0 +1,2 @@
+$("#polls_<%= @poll.id %>").html("<%= escape_javascript(render :partial => 'poll',:locals => {:poll => @poll}) %>");
+alert("发布成功");
\ No newline at end of file
diff --git a/app/views/poll/republish_poll.js.erb b/app/views/poll/republish_poll.js.erb
index a7399af5b..a2d8e28fa 100644
--- a/app/views/poll/republish_poll.js.erb
+++ b/app/views/poll/republish_poll.js.erb
@@ -1 +1,2 @@
-$("#polls_<%= @poll.id %>").html("<%= escape_javascript(render :partial => 'poll',:locals => {:poll => @poll}) %>");
\ No newline at end of file
+$("#polls_<%= @poll.id %>").html("<%= escape_javascript(render :partial => 'poll',:locals => {:poll => @poll}) %>");
+alert("取消成功");
\ No newline at end of file
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 4141164c4..e46aa5124 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -26,8 +26,8 @@ div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margi
 a.newbtn{ float:right; display:block; width:80px; height:30px; background:#64bdd9; color:#fff; font-size:14px; margin:10px; text-align:center;}
 a:hover.newbtn{ background:#55a1b9; text-decoration:none;}
 .polls_list ul{ padding-left:10px; border-bottom:1px dashed #c9c9c9; height:32px; padding-top:8px;}
-a.polls_title{ font-weight:bold; color:#3e6d8e;max-width: 350px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
-.polls_title{ font-weight:bold; color:#3e6d8e;max-width: 350px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
+a.polls_title{ font-weight:bold; color:#3e6d8e;max-width: 300px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
+.polls_title{ font-weight:bold; color:#3e6d8e;max-width: 300px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
 a.pollsbtn{ display:block; width:66px; height:22px; text-align:center; border:1px solid #64bdd9; color:#64bdd9;}
 a:hover.pollsbtn{ background:#64bdd9; color:#fff; text-decoration:none;}
 .polls_date{  color:#666666;}
@@ -134,3 +134,14 @@ a:hover.upload_btn_grey{background:#8a8a8a;}
 .upload_con a:hover{ text-decoration:none;}
 .polls_btn_box{ width:145px; margin:0 auto; padding-left:10px;}
 .polls_btn_box02{ width:80px; margin:0 auto; padding-left:10px;}
+
+/***新增20150120***/
+.pollsbtn_tip{ width:30px; height:17px; display:block;background:url(images/icons.png) 0 -417px  no-repeat;padding-left:7px; color:#fff;}
+a.btn_de{ border:1px solid #ff5d31; color:#ff5d31; }
+a:hover.btn_de{ background:#ff5d31;}
+a.btn_pu{ border:1px solid #3cb761; color:#3cb761; }
+a:hover.btn_pu{ background:#3cb761;}
+.pollsbtn_grey{ border:1px solid #b1b1b1; color:#b1b1b1; padding:0px 9px; }
+.polls_title_w { width:330px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
+.polls_de_grey{ color:#b1b1b1;}
+.ml5{ margin-left:5px;}

From 95dcdd71251982a69348d19f79b4c2ec1d3da8d1 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 21 Jan 2015 11:18:47 +0800
Subject: [PATCH 117/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E7=BC=96=E8=BE=91=E7=95=8C=E9=9D=A2=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index 6ce4137a3..b3fae8b4a 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -57,7 +57,7 @@
 
       function poll_submit()
       {
-          $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll},:is_remote => false) %>');
+          $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll,:is_remote => false}) %>');
           showModal('ajax-modal', '310px');
           $('#ajax-modal').css('height','110px');
           $('#ajax-modal').siblings().remove();

From 6ccb154cc3f6e98e219645474e76370fa6c0e105 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Wed, 21 Jan 2015 11:33:29 +0800
Subject: [PATCH 118/142] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=91=E9=82=AE=E4=BB=B6=E7=BB=99=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E4=BA=BA=20Signed-off-by:=20alan=20<54753343?=
 =?UTF-8?q?4@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .rspec                                        |  2 +
 app/helpers/courses_helper.rb                 |  4 ++
 app/models/journals_for_message_observer.rb   |  2 +
 app/models/mailer.rb                          |  8 ++--
 config/application.rb                         | 10 +++++
 .../20150121030451_add_initial_products.rb    | 11 ++++++
 db/schema.rb                                  |  2 +-
 spec/spec_helper.rb                           | 38 +++++++++++++++++++
 8 files changed, 72 insertions(+), 5 deletions(-)
 create mode 100644 .rspec
 create mode 100644 db/migrate/20150121030451_add_initial_products.rb
 create mode 100644 spec/spec_helper.rb

diff --git a/.rspec b/.rspec
new file mode 100644
index 000000000..8c18f1abd
--- /dev/null
+++ b/.rspec
@@ -0,0 +1,2 @@
+--format documentation
+--color
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 411de1dcf..95b049dc2 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -111,6 +111,10 @@ module CoursesHelper
     #garble count
  # end
 
+  #获取课程所有成员
+  def course_member course
+    course.members
+  end
   # 学生人数计算
   # add by nwb
   def studentCount course
diff --git a/app/models/journals_for_message_observer.rb b/app/models/journals_for_message_observer.rb
index 093002a2c..0e5f29d03 100644
--- 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
 
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 72e60a0bf..a2e742ee3 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -62,13 +62,13 @@ class Mailer < ActionMailer::Base
       course =  journals_for_message.jour
       @author = journals_for_message.user
       #课程的教师
-      @teachers = searchTeacherAndAssistant journals_for_message.jour
+      @members = course_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,
diff --git a/config/application.rb b/config/application.rb
index 716e3875d..2f1534d00 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -21,6 +21,16 @@ module RedmineApp
       config.verifier_email = "lizanle521@126.com"
     end
 
+    config.generators do |g|
+         g.test_framework :rspec,
+         fixtures: true,
+         view_specs: false,
+         helper_specs: false,
+         routing_specs: false,
+         controller_specs: true,
+         request_specs: false
+         g.fixture_replacement :factory_girl, dir: "spec/factories"
+      end
     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths += %W(#{config.root}/lib)
 
diff --git a/db/migrate/20150121030451_add_initial_products.rb b/db/migrate/20150121030451_add_initial_products.rb
new file mode 100644
index 000000000..cb6006068
--- /dev/null
+++ b/db/migrate/20150121030451_add_initial_products.rb
@@ -0,0 +1,11 @@
+class AddInitialProducts < ActiveRecord::Migration
+  def up
+    Forum.create(:name =>"new forum", :description => "", :topic_count => "0",
+                 :memo_count => "0", :last_memo_id =>"0", :creator_id =>"2",
+                  :sticky =>"0", :locked =>"0")
+  end
+
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2120080a0..7d10abc35 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150114022710) do
+ActiveRecord::Schema.define(:version => 20150121030451) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
new file mode 100644
index 000000000..d2cbea7d9
--- /dev/null
+++ b/spec/spec_helper.rb
@@ -0,0 +1,38 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+require 'rspec/autorun'
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+
+RSpec.configure do |config|
+  # ## Mock Framework
+  #
+  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
+  #
+  # config.mock_with :mocha
+  # config.mock_with :flexmock
+  # config.mock_with :rr
+
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+
+  # If true, the base class of anonymous controllers will be inferred
+  # automatically. This will be the default behavior in future versions of
+  # rspec-rails.
+  config.infer_base_class_for_anonymous_controllers = false
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = "random"
+end

From 2f8a183168b265bf9814a41cbc10577eba641bdb Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 21 Jan 2015 11:34:53 +0800
Subject: [PATCH 119/142] =?UTF-8?q?1=E3=80=81=E6=9B=BF=E6=8D=A2=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E5=9B=BE=E7=89=87=202=E3=80=81=E5=B7=B2=E7=AD=94?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=90=8E=E9=97=AE=E5=8D=B7=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=B2=E7=AD=94=E6=A0=87=E5=BF=97=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/images/icons.png | Bin 2382 -> 2479 bytes
 public/stylesheets/polls.css        |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/images/icons.png b/public/stylesheets/images/icons.png
index 2d2b33fe1a24f741e781b935549f8172180870ad..e0ba4f4e6525285ce88227c93c3fa01348628857 100644
GIT binary patch
literal 2479
zcmZ`*2~d;Q7XGskG^`2|g|H}#f}mJHksU=uF@YCamKXwxP}$NTvI`_Yw3J;)Y>-VM
zQI;rM2*fBstJFwTtg;6Eu~dWr22t4pzI5Kqo6dXf%y;KIbLM{Mo_p_^Gbh&<dsGdn
ziv$2b?U<JbPQkkX07Bb<P*_DOEmI2GNcIYf2LKhVKNkcjuh^<^8ije`FaVHh3ILRB
z09gL2V8!MHYXF!I1ptSi0RZ*G<&cM-3ccMi5BG1AM`kL6^YsF@P`cxq+%)STC8SMG
zpCH>k!oq`gwU>Df>-w>_=WuqEAlrkDr}HS3oZ^_zxmlVz8eT?q)6i2qS2?1+ere;2
zGk2~XbKkNB&On;)ZPN7m*{K-mew{6rfsU`G^L;aYLpF)6lgAm4lIGBvE{hfMADjnm
z63fMA)K<U=n9+Dy4KYw+%!m^2V5(SW^xq)mkU&-HgO^t2`*}EDb7e45shvxzT;w{$
zj@%n_sCEQfl>#&pYt6mct0>H9IE<Nw+PjtWOV4m|LcCM#EwR1~(s(kxGgxQ=G6x%2
z<EFpqNJj{e^h?Pv8$#6WMHzlaYi8GX0BfxV0CM4Na|aDVJpTM%vurcMUVnoq2R{Az
zy1Vx#ge!{T6gIt~-PsRb6Dw2kPkII|OcCSFnl;A*yC8cYlj7BfnA2AcZ|)nk++ugR
zFX-^t^{M+euRR@<5lX`5`P(`e1#L4$xp9+flGJ|U%;AABK_~I0NzdNG$&?f4%=e8S
z0hE0I7q`E6yD=Q2&b21-MzK|tjA>)(rR3Au2Xw(5ddoeBjvq9YWPQHpqORr{dA6-D
zdb@7^3*Y99`dzaR6Xp;75_gU4E=&b>4Y6nsXv3ir|Cn_2{;fI@S;b-5d2KzZ{o^Ly
zX!P!(1e=%iymI=PDh-iKE`Y50JAgw!&AcjT&2u)hRtqS6-{FDc;jQ8}L(nWWhf>w|
zTVmz8Fs@1e|6k!ho?d^G+>8fFal_LVcn;$Vd-YL?N79bMhk06%kyYaq*A5>j7eIy@
zP!em@5wk5tCZ*aH;e0!s+i;_n8$|mbAZew*k|vhArrL8K<2gDBA|JOekK=;__<;aK
z^sm+Jkq3B(V@PeOlaHQ<`q~8DwfD3k>K5dd#vF7Tj@<kYLA8bB03BC_6X`kD;G&9f
z7Ic3)E^Prm!+Mi{aa~!ind}>#jxkTrl3~DF_L`P(ALp}ay!f#23Z#7iOQIaF=Rvw*
z#PI2E6*=lGaC-w`VTa5L3=yI*V|HN8z)C<Z;uG)w`k}=loJ-{EOv`uWv%(v&1XtxM
z(VaYRVVLkJG`0#+W!IYotU@OPD2MUVCn>;}{aOX$wO)rsDA^-A-2v48po|3^F|TL>
zFiZCWr)9U{3Jfm|@kpLK1=fX^`rZ3|Vq1hk3z(s&^nLqUU7W=mGsDN;*?;^9$gjc&
zU0@PYVUY!^@ZBcT#ck8bZ9$^-1OCVLdH0{BZ6>S|rAwUyE5E0Vf|L0@FiCxx!&V!C
zeg}WiLbfdFJ<a*7B8-zt7S+5oN$Saxh7~N)K!Q@nbe+}z0LNOes<=*H62UQQbfN{T
zBa##H)KR^I8sT}+6*4!7?=JI3?Ph&}&-`kqmDQ{vfL?fTVwe0J-2UgQYEhi8sxdGk
z0t>su9Y7|-WX_F>2e!gXpFuT7_D5$ezR#OXxf@X1-+80|>`b%t#NENOwu0gnTy4KS
zy2<d5-TfIYt|Jq6=9meS)`q`UPG5MxEw_~sQQ~54IP>jpS`^s_&%tt<X04FVYp*KH
zJHE^G3ssZbH$O@Js!7g>3b*0~-Hu<Fa)soZC`s!5JBY}k^&fr=V|%yNQHl~9=%@v3
zIst~j2_q_Fu28kfH}G8*JT<6l9ff++QtF26^y3gjqj{@1;XX1zV^O?g<aeH5;;ht}
zhjybY@j(k8HyqHahVEgGKe^_5lJ4;5Ar)Be+ll&~d)n6XQ|)j4gl0{jSQIs{W<}72
zk6<V|r&zmr<BJw^u%6D1t&B3Q)^6USd<hFlYM@{FIQ{l976OBrhZ=pOq^eLjz7mzD
zB<&MAN1P)c9M9*&(IS;Ss^qt9`DLiiUus`6Lcz8%Q!CFa`@%Bdgsl%3R-?IiAGVZ_
zy4VjwK-ICn>1TZ_X97E2m|XlUqlt1GMihG<U$PPgT+A8$HUcMHgk-|kJu?wsst*fI
zFEimX4tq>boVxr$xRVkNj^~qe!%2wbon%JAnHP!R;JbwCpkHp#^2(<8bLqFF#AC=M
z_qHE1on=a(zHm)g1Upz^ORf)R7@rYC^I~SM0v9$eX|FMdY{@0x1P>OJZ9^pQmHB~m
z>WUWIMTHQ-bQfC4vNhd(^nC7=L-zP9QV%FqPdJ*7npIt9D1USRp-7_o6k*vfK6}?}
z;-m$Cky%H}qfhZkJD4uu1K}X$_Q^?XIk5I2zr`M>Q0Im-rskfdUz`g*U<gh8O{_A|
zcD}KnSl4GVrVBq$>4v6F%_SQ^*L%pTM%NT6VXWFz1sekaHYVqTwcJch>9ZsoExZ3s
z-$HAIHokHgjN(2moX(Eoj&v!yA)a{fog~=U|55PiY-qAG)Il7vKtRA;21&fdBPr23
zDYv9^dMw1zwfG6Il#(glCZ~0mn?V}Fgy5qU9>DFL!p@c@=B7-4vy{sosK0z{S;Bk}
zzq^so8zY6}2aeAoGBy%&@fs%^c~wq>341-;ryl3wHAZzM5P?>pozW?BBU@Yu58>~8
zM#<?hWdvMbjTcN(N3)7`B(ZEU6;4V27~`d~r^Tsv!3ob95TCCu1w)b#j2SKt-H)g}
zVdUYRJ8^{R_P*Q%e%X?|uegq;7ig<w^cabP9K&}uTmK&W(Is{po@oAPd)1A!H}ig{
zURS!Mm3+J}aMZDe&yo1u@GrDmY^o|%ulS1gi^%;~@6-zH;1~STRH@Qof~3n{t?DPJ
zb#I$L!I2JnSO00(Ptf1LE?6U!C0hPExm6JF*z{?F7TKG1!o=sC4RjafzvyE0+~qGb
z=f&Lyt9Olq1+-XlMug*7?{^p@P~L}@eFut5mF->Qv*yw(wW70o-)Ba>_MjJpPs;mj
sYp6*W92!kPdDk%9tSIS!e1!qVBLZ96PYv^mVGB5R1nY6@P-xb_0kz3y2mk;8

literal 2382
zcmZ`*3pA8l8{VHWqG)o7<eIzWo=YwxMVXYMaKxZwRGKkA88p<OtK1S%E;%Bdn3OSQ
z+&^{b9M{}qhCY{)`&1_4$eGsq|FzCKtADL$ujgIwde(m5XRrP4wQn7BIViDl`$hnO
z1kTC9O~5(;Kxaio1d(P}6;nWBWGAmM05(bgSP*!SvrUjx4RCTh0>C9r0BG?5d|Mar
z6ae8y08IM>V3h@cTu7Q<(*XcPdvOl-CnAStbN!wudMdrPV|YE4Jn|@OBmujK`<;Mu
zxJ@@p<%H{>OElK>Pq;RsM@f0&zU5RV*2|HrZ7<p4I$p=*hh!9<O(KU<1MYexpdSsW
zO*GxsVSi|p>AL#3effFNye*YNm~Wfym_72@`neJHLtBX5s`ccOby$7Sx^S+`hO#yY
z1E_T?$Ke3Dz<Y3pufyog8TY2yflbEbx7BFQ2icuF!!e|qNxJ)F^hDoq<s3EVOA$&r
z4EeA|stD|&tj7_lZTs$xG==r+og*7e)Y^^^%k-6aP_ef<dk!|)GW5E9eAJO6J2~VA
zJ)%Xn{bu(8-Qw$gV}KH}mFDWjr;Qa@J|hOw<V-5ccGdk3&3{cZF}`()dH&7Gmo&Qx
z`@Hh-Na9g<=;P+)J;gOau`rg9yTd4R%P&Qcfl$!gmunKC-sw+X4D9kSyQ>)bSkUt|
z+;RNG=zjN(rV`4K6(K$_<WRD8@Tf;g@|b8SRx@F;q#Aeg(3a~vva5REPB;Sev45kC
z0O$8iB{GfX`IqeP)9x&~E;{a$k002M2+gecYZm26lRBcXb`lt^sI%(tnNkA&qs*_g
zg?bKelS%f`&B0hMK;Q5u_xNzP9p)tDK5X8W=xmCe=ta7lk?6juLMP>%op0Su`}#_%
z^>m}{bXGNlbZ9@talLX+i$4uE4_-C#vHg`}g6GarG@XRWX#qxW+i0iy;_bo;WF_(c
zcJN<M<nxXWi^27`XIwnH<|wahhAku{ZJjLd>2wHxoKHz#W5lFA5lCCXMQP^4iel{D
z3y&vuvAm_x>2+3+%-;V4ct(~yp|IzUd9G*H1?EXyu^JTmN1pM4>R$jfja%IjWx)z)
z<{scTGDq#-nL0kQY%)EioPtaBiJ+DDX#Cu#!2CG0vuIz@3Cr-kMZGRXCk)DV7Ev<9
z*jf!<m^I9@7%#tnCBbd_0K$RSD%Ygp{U>KOeSL5vwhTH;kM9N<ZVMupF}02TS5%e_
z--!55;=gR<DItEa=Y`>|{tf*r7I#GwD_?$piKMt;10G&6dH+Cx))^JvAe5(Db2}Ku
z(2hnD^U%J}U$aou+Aq#9MCUh|fB|#qxvbTcu=zmbdH+hGoQ#S{o^a*h)3CtCZ_3dO
zB~Qu4gBATpwH@Z|5w@vTPywuK+HNxquNjDSTw2vtIMJ0AU9k((FD=FUBL6IAGrL_`
z#r2SquKIAIX`j0ZqxVrnX}Z;PVJ7Ab`)hp1Cs#VZxJ5bMuL7lvY%c2ko<22~-&2<v
zYnXwR3#R*tBwI~hK4Txv-Vcwv^ewd{Aivt2ZH=0YR1jP{ew_3R7PPSRZ18dVPyzEY
zeb(kJ$_hRAmm>RU@Y;D@d};d7RFZl?i0GIvPl~5c-7lH(3jW^REI8RtSQaruG|0z-
z=`<E(cX7xL;+8VM3-R);3B=EN(PFR2b6q6X0*S@(9=7sUspQNVJ+AL3u`nzAyU}Nc
z43i1j<)lNV=v$@J!v7d3XRqDuyXX^Mg(+Oj*X*Q2wrtZf&!BrA6nFGClQ&SqOz*po
z^jMV*mDZgqA{`yO=;@RJ1@6VqM}hPm+G=|<UmL1fm-v)A*R3YSyK|ZG>Cj;J>#hC{
zLX|UTScy*X8e#nOV89kZLL}`(zoZ!Z-31>V>x3H`h>RtzMFZJBvu?2XpJHr@uwsU~
zsk7cG`6)t=Gi+uZgBCAwuhK*=Gb9(YlkyK^Hsj#J)^mN%usK~E2h09$s4hkJlAN8i
zzj=p7OmoSg3A(NnNJBOJwK2*1&{B4iXY2G>yFP?cmoiG#`9b7{!N{kx1|n?Eh@wwh
z<Uu@Yb2?gX1AB_}%~449AM;dO55>D^FIi1d^3i|ESX$hAw-CZS8El?pJlXsS!6GuK
zKz=4A#>9Y|+U`*j9_9+OK*$-q)MafR-+0u#;{I0Nepn^8!MGIu9wyE{Y|a4nt(DXo
zyy3di@@}$tWTC1LAzJ|&fpQ4=!`09-J%$@B_bF;rinu*s-mKZDW#h7I&CM%%yg;N5
zj)6OEB(yO;q-?&hHv<-$S=9o5Xl(0qsq75~U5|~mx(JGhEo?{|pz@Cnt*DW&5m#tO
zkk`i7^O$!iRlw)zk$|@MrN@U)DL8UYkG!vsBmZV@5f=spi_6e0nrfY!5UN(xsGFd+
z$zUQ-f$E{?o;?v<t&dma+L~?&T;C`5%g=Vk<TbKLSdm%({7oHlQyw#Q4%uGSeH+AS
z4MH{BW+Ros_r}Oo)fWPN6|p}y0))Y&?9tW42At_>hN$9A?9blN9%z<Q6I4AsKZUD1
zR?=tHbDkN>DJjmW347VWKHi)Ue3NMQ#XWnD`-6v5{7cld0_IKIfVMo`C33gQL6?e5
zorWXG<U&m6b<mu(H_ic+X~7j$%T;0x9y_RN1)K80#{Z$EdU<zzr~7cv48KFWlt%##
zA_kiD8@YX)2Z9~HT{RE>n%4j7*#?%-0_vW=lOngA$S`}A?aK(VA45zyCC1B^BhD}#
zTZoD%Au<e6NUE(|cWmngL(x~MBo<XV{vGb7LGA6v8&sbF25!G<v-AB~O^MjIW;k&T
zN5oC_&rKHPXFsdzZp;KYUp9NUG>K;uBG2*F*HraA&8r&^8Y{4lUy_<@a*WvNFV4k_
zW5pEZ@f|36l*MU7y)$p7E>bicgT<Gxj~k1Sh;2o=&R>vQ8h~muGr^RWA6fhn=d}7J
zHL_m#9sZn*`lj~i9XDAo`0H5h_+CQ!(mDk6uNQX3y-ao&{DlC{(Z%7}KL5DC0Rml0
AWB>pF

diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index e46aa5124..06802285d 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -136,7 +136,7 @@ a:hover.upload_btn_grey{background:#8a8a8a;}
 .polls_btn_box02{ width:80px; margin:0 auto; padding-left:10px;}
 
 /***新增20150120***/
-.pollsbtn_tip{ width:30px; height:17px; display:block;background:url(images/icons.png) 0 -417px  no-repeat;padding-left:7px; color:#fff;}
+.pollsbtn_tip{ width:30px; height:17px; display:block;background:url(images/icons.png) 0 -372px  no-repeat;padding-left:7px; color:#fff;}
 a.btn_de{ border:1px solid #ff5d31; color:#ff5d31; }
 a:hover.btn_de{ background:#ff5d31;}
 a.btn_pu{ border:1px solid #3cb761; color:#3cb761; }

From a53831a6b5f35f107bd4087b020ef6a984bda3f9 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 21 Jan 2015 11:44:49 +0800
Subject: [PATCH 120/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=93=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E6=A0=87=E9=A2=98=E8=BF=87=E9=95=BF=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=9F=A5=E7=9C=8B=E9=97=AE=E5=8D=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=9C=81=E7=95=A5=E5=8F=B7=E8=BF=87=E6=97=A9=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb
index cc7e88547..3290ff2dc 100644
--- a/app/views/poll/_poll.html.erb
+++ b/app/views/poll/_poll.html.erb
@@ -10,11 +10,11 @@
       <% end %>
   <% else %>
       <% if has_commit && poll.polls_status == 2 %>
-          <sapn class="polls_title fl" >
+          <sapn class="polls_title fl" style="max-width: 500px;">
             <%= poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name %>
           </sapn>
       <% elsif !has_commit && poll.polls_status == 2 %>
-          <%= link_to (poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name), poll_path(poll.id), :class => "polls_title polls_title_w fl" %>
+          <%= link_to (poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name), poll_path(poll.id), :class => "polls_title polls_title_w fl", :style => "max-width: 550px;width: 550px;" %>
       <% end %>
   <% end %>
 </li>

From 77b8bf18c8f042c02f783e85c23246ef18c6929e Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 21 Jan 2015 11:50:33 +0800
Subject: [PATCH 121/142] =?UTF-8?q?#1842=20=E4=BF=AE=E6=94=B9=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=9D=A2=E6=8F=8F=E8=BF=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_edit_MCQ.html.erb | 2 +-
 app/views/poll/_new_MCQ.html.erb  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/poll/_edit_MCQ.html.erb b/app/views/poll/_edit_MCQ.html.erb
index 613fed371..129f50e94 100644
--- a/app/views/poll/_edit_MCQ.html.erb
+++ b/app/views/poll/_edit_MCQ.html.erb
@@ -18,7 +18,7 @@
   <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  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>
diff --git a/app/views/poll/_new_MCQ.html.erb b/app/views/poll/_new_MCQ.html.erb
index de9dc9f08..027a1c1f6 100644
--- a/app/views/poll/_new_MCQ.html.erb
+++ b/app/views/poll/_new_MCQ.html.erb
@@ -3,7 +3,7 @@
     <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 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>

From f01d164295ea186cf827a4e551baed20b9b0ed61 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Wed, 21 Jan 2015 12:01:02 +0800
Subject: [PATCH 122/142] Signed-off-by: alan <547533434@qq.com>

---
 app/helpers/courses_helper.rb | 2 +-
 app/models/mailer.rb          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 95b049dc2..22eb9bfae 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -112,7 +112,7 @@ module CoursesHelper
  # end
 
   #获取课程所有成员
-  def course_member course
+  def course_all_member course
     course.members
   end
   # 学生人数计算
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index a2e742ee3..2cd069175 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -62,7 +62,7 @@ class Mailer < ActionMailer::Base
       course =  journals_for_message.jour
       @author = journals_for_message.user
       #课程的教师
-      @members = course_member journals_for_message.jour
+      @members = course_all_member journals_for_message.jour
       #收件人邮箱
       @recipients ||= []
       @members.each do |teacher|

From 520e9c73aa34be5f9983f9bf1820f35311c91102 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 21 Jan 2015 14:30:19 +0800
Subject: [PATCH 123/142] =?UTF-8?q?#1836=20=E6=9C=AA=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=88=96=E8=80=85=E6=B2=A1=E6=9C=89=E6=9D=83=E9=99=90=E8=AE=BF?=
 =?UTF-8?q?=E9=97=AE=E7=A7=81=E6=9C=89=E9=A1=B9=E7=9B=AE=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=88=B0403=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index d3df57982..24a3ff19f 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -558,6 +558,11 @@ class ProjectsController < ApplicationController
 
   # Show @project
   def show
+    if(@project && !@project.is_public && !User.current.member_of?(@project))
+      render_403
+      return
+    end
+
     @project_type = params[:project_type]
     
     # try to redirect to the requested menu item

From 7ee17b6d7ceb038ee5d24f8045868237daefc275 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 21 Jan 2015 15:43:15 +0800
Subject: [PATCH 124/142] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=B7=A6=E8=BE=B9=E8=BE=B9=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/polls.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 06802285d..e601d231d 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -19,7 +19,7 @@ div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margi
 .polls_btn span{ color:#15bed1; font-size:12px; font-weight:normal;}
 
 /*问卷列表*/
-.polls_content{ width:615px;}
+.polls_content{ width:615px;padding-left: 6px;}
 .polls_head{ width:677px; height:48px; background:#eaeaea;}
 .polls_head h2{ float:left; font-size:14px; color:#585858; margin:11px 0 0 10px;}
 .polls_head span{ font-weight:normal; color:#15bccf;}

From d68486669e5712e268769fde68fceac04392d985 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 21 Jan 2015 16:07:44 +0800
Subject: [PATCH 125/142] =?UTF-8?q?#1830=E8=AF=BE=E7=A8=8B--=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=AD=97=E4=BD=93=E5=8E=8B=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/member.html.erb   | 2 +-
 public/stylesheets/course_group.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/courses/member.html.erb b/app/views/courses/member.html.erb
index 2599760ad..803be3731 100644
--- a/app/views/courses/member.html.erb
+++ b/app/views/courses/member.html.erb
@@ -56,7 +56,7 @@
 </script>
 <%= stylesheet_link_tag  'course_group', :media => 'all' %>
 <script type="text/javascript" src="javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js"></script>
-<div class="st_list">
+<div class="st_list" id="member_of_course">
   <div class="st_search" style="margin-left: 14px" >
     <span class="f_l"><%= @subPage_title %></span>
         <span id = "search_members">
diff --git a/public/stylesheets/course_group.css b/public/stylesheets/course_group.css
index b6c7f4f8c..c160e1730 100644
--- a/public/stylesheets/course_group.css
+++ b/public/stylesheets/course_group.css
@@ -1,4 +1,4 @@
-body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+#member_of_course{ 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,textarea,form{ margin:0; padding:0;}
 div,img,tr,td,textarea,form{ border:0;}
 table,tr,td{border:0; cellspacing:0; cellpadding:0;}

From 54c8ee9d4d29ab264c3baa3deebd345ca0aabe3a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Wed, 21 Jan 2015 17:51:12 +0800
Subject: [PATCH 126/142] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E7=AD=94=E5=AE=8C=E9=97=AE=E5=8D=B7=E4=B9=8B=E5=90=8E=E3=80=82?=
 =?UTF-8?q?=E8=83=BD=E7=9C=8B=E5=88=B0=E8=87=AA=E5=B7=B1=E7=AD=94=E9=A2=98?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb          | 12 +++++--
 app/helpers/poll_helper.rb                  |  2 +-
 app/views/poll/_poll.html.erb               | 11 +++----
 app/views/poll/_show_MCQ_result.html.erb    | 26 +++++++++++++++
 app/views/poll/_show_MC_result.html.erb     | 27 ++++++++++++++++
 app/views/poll/_show_mulit_result.html.erb  | 20 ++++++++++++
 app/views/poll/_show_single_result.html.erb | 18 +++++++++++
 app/views/poll/poll_result.html.erb         | 36 +++++++++++++++++++++
 config/routes.rb                            |  1 +
 9 files changed, 144 insertions(+), 9 deletions(-)
 create mode 100644 app/views/poll/_show_MCQ_result.html.erb
 create mode 100644 app/views/poll/_show_MC_result.html.erb
 create mode 100644 app/views/poll/_show_mulit_result.html.erb
 create mode 100644 app/views/poll/_show_single_result.html.erb
 create mode 100644 app/views/poll/poll_result.html.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 42ab98e10..4abddaa5e 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -1,7 +1,7 @@
 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]
+  before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll,:commit_answer,:publish_poll,:republish_poll,:poll_result]
   before_filter :find_container, :only => [:new,:create, :index]
-  before_filter :is_member_of_course, :only => [:index,:show]
+  before_filter :is_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
@@ -330,6 +330,14 @@ class PollController < ApplicationController
     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]
diff --git a/app/helpers/poll_helper.rb b/app/helpers/poll_helper.rb
index 17ef02a36..60d82c096 100644
--- a/app/helpers/poll_helper.rb
+++ b/app/helpers/poll_helper.rb
@@ -73,5 +73,5 @@ module PollHelper
       "多行主观题"
     end
   end
-  
+
 end
\ No newline at end of file
diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb
index 3290ff2dc..c53f09361 100644
--- a/app/views/poll/_poll.html.erb
+++ b/app/views/poll/_poll.html.erb
@@ -1,20 +1,19 @@
 <% 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">
-            <%= poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%>
+            <%= 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.polls_name.empty? ? l(:label_poll_new) : poll.polls_name), poll_path(poll.id), :class => "polls_title polls_title_w fl" %>
+          <%= link_to poll_name, poll_path(poll.id), :class => "polls_title polls_title_w fl" %>
       <% end %>
   <% else %>
       <% if has_commit && poll.polls_status == 2 %>
-          <sapn class="polls_title fl" style="max-width: 500px;">
-            <%= poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name %>
-          </sapn>
+          <%= 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.polls_name.empty? ? l(:label_poll_new) : poll.polls_name), poll_path(poll.id), :class => "polls_title polls_title_w fl", :style => "max-width: 550px;width: 550px;" %>
+          <%= link_to poll_name, poll_path(poll.id), :class => "polls_title polls_title_w fl", :style => "max-width: 550px;width: 550px;" %>
       <% end %>
   <% end %>
 </li>
diff --git a/app/views/poll/_show_MCQ_result.html.erb b/app/views/poll/_show_MCQ_result.html.erb
new file mode 100644
index 000000000..f46882881
--- /dev/null
+++ 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-->
\ No newline at end of file
diff --git a/app/views/poll/_show_MC_result.html.erb b/app/views/poll/_show_MC_result.html.erb
new file mode 100644
index 000000000..7f2cbbd83
--- /dev/null
+++ 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-->
\ No newline at end of file
diff --git a/app/views/poll/_show_mulit_result.html.erb b/app/views/poll/_show_mulit_result.html.erb
new file mode 100644
index 000000000..e54cca505
--- /dev/null
+++ 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%>
+      </p>
+    </div>
+  </div>
+</li><!--多行输入 end-->
\ No newline at end of file
diff --git a/app/views/poll/_show_single_result.html.erb b/app/views/poll/_show_single_result.html.erb
new file mode 100644
index 000000000..07559773d
--- /dev/null
+++ 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-->
\ No newline at end of file
diff --git a/app/views/poll/poll_result.html.erb b/app/views/poll/poll_result.html.erb
new file mode 100644
index 000000000..a7cb415b3
--- /dev/null
+++ b/app/views/poll/poll_result.html.erb
@@ -0,0 +1,36 @@
+<%= stylesheet_link_tag  'polls', :media => 'all' %>
+<div class="polls_content polls_box">
+  <div class="ur_page_head" >
+    <h1 class="ur_page_title">
+      <%= @poll.polls_name.empty? ? l(:label_poll_new) : @poll.polls_name %>
+    </h1>
+    <p class="ur_prefix_content">
+      <%= @poll.polls_description%>
+    </p>
+  </div>
+  <div class="ur_card">
+    <ol class="ur_questions">
+      <% @poll_questions.each do |poll_question|%>
+          <% if poll_question.question_type == 1%>
+              <%= render :partial => 'show_MC_result', :locals => {:poll_question => poll_question} %>
+          <% elsif poll_question.question_type == 2%>
+              <%= render :partial => 'show_MCQ_result', :locals => {:poll_question => poll_question} %>
+          <% elsif poll_question.question_type == 3%>
+              <%= render :partial => 'show_single_result', :locals => {:poll_question => poll_question} %>
+          <% elsif poll_question.question_type == 4%>
+              <%= render :partial => 'show_mulit_result', :locals => {:poll_question => poll_question} %>
+          <% end%>
+      <% end%>
+    </ol>
+  </div> <!--ur_cards end-->
+  <div class="cl"></div>
+
+  <!-- 分页 -->
+  <div class="polls_content" id="polls">
+      <ul class="wlist">
+        <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+      </ul>
+      <div class="cl"></div>
+  </div>
+</div><!--问卷内容end-->
+
diff --git a/config/routes.rb b/config/routes.rb
index 67b0118b0..524373378 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -66,6 +66,7 @@ RedmineApp::Application.routes.draw do
       post 'commit_poll'
       get 'publish_poll'
       get 'republish_poll'
+      get 'poll_result'
     end
     collection do
       delete 'delete_poll_question'

From 3279928bef0cb9256d4d651f97841dce515f941a Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Wed, 21 Jan 2015 18:12:04 +0800
Subject: [PATCH 127/142] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E5=9B=BD=E9=99=85=E5=8C=96=EF=BC=9B?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=B5=84=E6=96=99=E9=A1=B5=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/mailer.html.erb            |  4 +--
 app/views/mailer/_issue.html.erb             | 14 +++++------
 app/views/mailer/_issue.text.erb             | 14 +++++------
 app/views/mailer/issue_add.html.erb          |  2 +-
 app/views/mailer/issue_add.text.erb          |  2 +-
 app/views/mailer/issue_edit.html.erb         | 22 ++++++++++-------
 app/views/mailer/issue_edit.text.erb         |  4 +--
 app/views/my/account.html.erb                | 26 ++++++++++----------
 app/views/users/_mail_notifications.html.erb |  2 +-
 config/locales/en.yml                        | 16 +++++++++++-
 config/locales/zh.yml                        | 15 +++++++++++
 11 files changed, 77 insertions(+), 44 deletions(-)

diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index b80206728..a05eacbd1 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -11,7 +11,7 @@ div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,ol{ ma
 div,img,tr,td,table{ border:0;}
 table,tr,td{border:0;cellspacing:0; cellpadding:0;}
 ol,ul,li{ list-style-type:none}
-.cl{ clear:both; overflow:hidden; }
+.cl{ clear:both; overflow:hidden; margin-top: 30px;}
 a{ text-decoration:none; }
 a:hover{ text-decoration:underline; }
 .mail_box,ul,li{ list-style-type:none}
@@ -35,7 +35,7 @@ a:hover.mail_reply{ background:#06a9bc; text-decoration:none;}
  <div class="container">
 	<div class="mail">
     	<div class="mail_head">
-        	<p>亲爱的Trustie用户，您好！</p>
+        	<p><%= l(:mail_issue_greetings)%></p>
         </div><!--mail_head end-->
         <%= yield %>
         <hr />
diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb
index 5979877a3..c97c82426 100644
--- a/app/views/mailer/_issue.html.erb
+++ b/app/views/mailer/_issue.html.erb
@@ -2,19 +2,19 @@
 <p>
       <span class="c_blue">
         <%= link_to(h("#{@issue.author}(#{@issue.author.show_name})"), @issue_author_url) %>
-     </span>在
-  <span class="c_blue"><%= link_to(h("#{@issue.project.name}"),@project_url) %></span>中有了一个与您相关的最新活动，请您关注！</p>
+     </span><%= l(:mail_issue_title_userin)%>
+  <span class="c_blue"><%= link_to(h("#{@issue.project.name}"),@project_url) %></span></span><%= l(:mail_issue_title_active)%></p>
 <div class="mail_box">
 <ul>
-	<li style="list-style-type:none"><span style="float: left"><strong>标题：</strong></span><span style="float: left; width: 500px"><%= link_to(issue.subject, issue_url) %></span></li>
-	<li style="list-style-type:none"><span style="float: left"> <strong>来源：</strong></span><span style="float: left; width: 500px"><%= issue.project.name %><b>|&nbsp;</b>项目<%= issue.tracker.name%></span></li>
-	<li style="list-style-type:none"><span style="float: left"> <strong >内容：</strong></span><span style="float: left; width: 500px">
+	<li style="list-style-type:none"><span style="float: left"><strong><%= l(:mail_issue_subject)%></strong></span><span style="float: left; width: 500px"><%= link_to(issue.subject, issue_url) %></span></li>
+	<li style="list-style-type:none"><span style="float: left"> <strong><%= l(:mail_issue_sent_from)%></strong></span><span style="float: left; width: 500px"><%= issue.project.name %><b>|&nbsp;</b><%= l(:mail_issue_from_project)%></span></li>
+	<li style="list-style-type:none"><span style="float: left"> <strong ><%= l(:mail_issue_content)%></strong></span><span style="float: left; width: 500px">
                     	<%= issue.description %></span>
     </li>
   <li style="list-style-type:none">
 
     <% unless @issue.attachments.nil? %>
-     <span style="float: left"> <strong>附件：</strong>
+     <span style="float: left"> <strong><%= l(:mail_issue_attachments)%></strong>
             </span><span style="float: left; width: 500px">
           <% @issue.attachments.each do |attach| %>
           <p><%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %></p>
@@ -25,7 +25,7 @@
   </li>
 </ul>
   <div class="cl"></div>
-  <label  class="mail_reply"><%= link_to( "我要回复", issue_url,  :class => "mail_reply") %></label>
+  <label  class="mail_reply"><%= link_to( l(:mail_issue_reply), issue_url,  :class => "mail_reply") %></label>
   <div class="cl"></div>
 </div>
 <!-- <li><%#=l(:field_author)%>: <%#=h issue.author %></li>
diff --git a/app/views/mailer/_issue.text.erb b/app/views/mailer/_issue.text.erb
index ae80a3fe0..89ee8337e 100644
--- a/app/views/mailer/_issue.text.erb
+++ b/app/views/mailer/_issue.text.erb
@@ -1,13 +1,13 @@
 
         <%= link_to(h("#{@issue.author}(#{@issue.author.show_name})"), @issue_author_url) %>
-     在
- <%= link_to(h("#{@issue.project.name}"),@project_url) %>中有了一个与您相关的最新活动，请您关注！
-标题：<%= link_to(issue.subject, issue_url) %>
-  来源：<%= issue.project.name %>|&nbsp;项目缺陷<
- 内容：
+     <%= l(:mail_issue_title_userin)%>
+ <%= link_to(h("#{@issue.project.name}"),@project_url) %><%= l(:mail_issue_title_active)%>
+<%= l(:mail_issue_subject)%><%= link_to(issue.subject, issue_url) %>
+<%= l(:mail_issue_sent_from)%>|&nbsp;<%= l(:mail_issue_from_project)%>
+<%= l(:mail_issue_content)%>
      <%= issue.description %>
         <% unless @issue.attachments.nil? %>
- 附件：
+<%= l(:mail_issue_attachments)%>
 
 
             <% @issue.attachments.each do |attach| %>
@@ -16,4 +16,4 @@
         <% end %>
 
 
- <%= link_to( "我要回复", issue_url) %>
+ <%= link_to( l(:mail_issue_reply), issue_url) %>
diff --git a/app/views/mailer/issue_add.html.erb b/app/views/mailer/issue_add.html.erb
index 4db0113b9..e46a93381 100644
--- a/app/views/mailer/issue_add.html.erb
+++ b/app/views/mailer/issue_add.html.erb
@@ -5,5 +5,5 @@
 
 
 </div>
-<div class="mail_foot"><%= link_to("退订该邮件？", @user_url)  %> </div>
+<div class="mail_foot"><%= link_to( l(:mail_issue_footer), @user_url)  %> </div>
 
diff --git a/app/views/mailer/issue_add.text.erb b/app/views/mailer/issue_add.text.erb
index 31d9632db..c5b391685 100644
--- a/app/views/mailer/issue_add.text.erb
+++ b/app/views/mailer/issue_add.text.erb
@@ -1,3 +1,3 @@
 
 <%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
-<%= link_to("退订该邮件？", @user_url)  %>
\ No newline at end of file
+<%= link_to( l(:mail_issue_footer), @user_url)  %>
\ No newline at end of file
diff --git a/app/views/mailer/issue_edit.html.erb b/app/views/mailer/issue_edit.html.erb
index 0c46b5e60..6fcb0ddb5 100644
--- a/app/views/mailer/issue_edit.html.erb
+++ b/app/views/mailer/issue_edit.html.erb
@@ -1,15 +1,19 @@
-<%= 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, :token => @token.value).each do |string| %>
+  <ul>
+    <% details_to_strings(@journal.details, false, :only_path => false, :token => @token.value).each do |string| %>
       <% if (!string.include? l(:label_attachment)) && (!string.include? "attachments")  %>
         <li><%= string %></li>
-  <% end %>
-<% end %>
-</ul>
+      <% end %>
+    <% end %>
+  </ul>
+
+  <span style="float: left"><strong><%= l(:field_content)%>：</strong></span><span style="float: left; width: 540px"><%= @journal.notes %></span>
+</div>
+<div class="cl"></div>
+<hr/>
 
-<span style="float: left"><strong><%= l(:field_content)%>：</strong></span><span style="float: left; width: 540px"><%= @journal.notes %></span>
-<hr />
 <%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
-<div class="mail_foot"><%= link_to("退订该邮件？", @user_url)  %> </div>
+<div class="mail_foot"><%= link_to( l(:mail_issue_footer), @user_url)  %> </div>
 
diff --git a/app/views/mailer/issue_edit.text.erb b/app/views/mailer/issue_edit.text.erb
index 70e4186c4..aad21ad90 100644
--- a/app/views/mailer/issue_edit.text.erb
+++ b/app/views/mailer/issue_edit.text.erb
@@ -10,7 +10,7 @@
     <%= l(:field_content)%>：<%= @journal.notes %>
 
 <% end -%>
-----------------------------------------
+--------------------------------------------------------------------------------
 <%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
 
-<%= link_to("退订该邮件？", @user_url)  %>
\ No newline at end of file
+<%= link_to( l(:mail_issue_footer), @user_url)  %>
\ No newline at end of file
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 2621d4fa3..47cfb4221 100644
--- 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: 50px;">
-      <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: 52px;">
-              <%= 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: 52px;">
-                <%= 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>
@@ -318,7 +318,7 @@
           });
       </script>
 
-      <p style="width:400px;padding-left: 55px;"><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: 8px;"> <!-- modified by ming -->
+      <div style="padding-left: 3px;"> <!-- modified by ming -->
         <p style="width:380px;">
           <%= render :partial => 'users/mail_notifications' %>
         </p></div>
diff --git a/app/views/users/_mail_notifications.html.erb b/app/views/users/_mail_notifications.html.erb
index a8d3edc55..7dd4ad77f 100644
--- a/app/views/users/_mail_notifications.html.erb
+++ b/app/views/users/_mail_notifications.html.erb
@@ -1,5 +1,5 @@
 <p>
-<%= label_tag "user_mail_notification", l(:description_user_mail_notification), :class => "hidden-for-sighted_bak" %>
+<%= label_tag "user_mail_notification", l(:description_user_mail_notification), :class => "hidden-for-sighted_bak" , :style=> 'margin-right: 5px;'%>
 <%= select_tag(
       'user[mail_notification]',
       options_for_select(
diff --git a/config/locales/en.yml b/config/locales/en.yml
index dd79a546c..830ea18e0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -224,7 +224,21 @@ en:
   mail_body_wiki_content_added: "The '%{id}' wiki page has been added by %{author}."
   mail_subject_wiki_content_updated: "'%{id}' wiki page has been updated"
   mail_body_wiki_content_updated: "The '%{id}' wiki page has been updated by %{author}."
-
+  
+  # edit by meng
+  # emailer
+  mail_issue_greetings: "Dear user , Greetings from Trustie"
+  mail_issue_footer: "Unsubscribe this message?"
+  mail_issue_title_userin: "in"
+  mail_issue_title_active: "has a new activity which relevants to you , please pay more attention to this!"
+  mail_issue_subject: "Title："
+  mail_issue_content: "Content："
+  mail_issue_sent_from: "From："
+  mail_issue_from_project: "project issue"
+  mail_issue_attachments: "Attachments："
+  mail_issue_reply: "Want reply"
+  #end
+  
   field_name: Name
   field_description: Description
   field_summary: Summary
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index f36174cf9..7d373ca25 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -233,6 +233,21 @@ zh:
   mail_body_wiki_content_added: "'%{id}' wiki页面已由 %{author} 添加。"
   mail_subject_wiki_content_updated: "'%{id}' wiki页面已更新。"
   mail_body_wiki_content_updated: "'%{id}' wiki页面已由 %{author} 更新。"
+  
+  # edit by meng
+  # emailer
+  mail_issue_greetings: "亲爱的Trustie用户，您好！"
+  mail_issue_footer: "退订该邮件！"
+  mail_issue_title_userin: "在"
+  mail_issue_title_active: "中有了一个与您相关的最新活动，请您关注！"
+  mail_issue_subject: "标题："
+  mail_issue_content: "内容："
+  mail_issue_sent_from: "来源："
+  mail_issue_from_project: "项目问题跟踪"
+  mail_issue_attachments: "附件："
+  mail_issue_reply: "我要回复"
+  #end
+  
   field_name: 名称
   #added by huang
   field_tea_name: 教师

From e72ed1054e8fc36119eb3ccca726e4f7643375f5 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 22 Jan 2015 09:39:04 +0800
Subject: [PATCH 128/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E8=B0=83=E6=9F=A5=E6=8C=89=E9=92=AE=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_courses.html.erb | 17 +++++++++++++----
 public/stylesheets/polls.css            |  6 +++---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index f0204f7ee..466e711c2 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -300,13 +300,22 @@
 
     <div class="user_underline"></div>
 
+    <style type="text/css">
+        .polls_btn{ height:33px;border-top:0 solid #15bed1; border-bottom:1px solid #15bed1;border-right:1px solid #cee6e6; width:224px; padding:7px 0 0 15px; }
+        .polls_btn a{font-size:14px; color:#444444;font-weight:bold;}
+        .polls_btn span{ color:#15bed1; font-size:12px; font-weight:normal;}
+        .polls_btn a{ float:left;}
+        .polls_n{float: left;background: #ff5d31;color: #fff;width: 12px;padding-left: 2px;height: 7px;padding-bottom: 5px;padding-top: 3px;margin-top: -4px;margin-left: 3px; }
+        .polls_n p{ margin-top:-4px;}
+        .cl{ clear:both; overflow:hidden; }
+    </style>
     <div class="polls_btn">
       <!--<a href="#">问卷调查<span >（12）</span></a>-->
-      <style type="text/css">
-          .polls_btn{ height:33px;border-top:1px solid #15bed1; border-bottom:1px solid #15bed1;border-right:1px solid #cee6e6; width:224px !important; padding:7px 0 0 15px; }
-          .polls_btn a{font-size:14px; color:#444444;font-weight:bold;}
-      </style>
       <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id)%>
+      <div class="polls_n">
+        <p>N</p>
+      </div>
+      <div class="cl"></div>
     </div>
   </div>
 </div>
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index e601d231d..863ee5864 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -14,9 +14,9 @@ div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margi
 #polls .fr{ float:right;}
 
 /*问卷按钮*/
-.polls_btn{ height:33px;border-top:1px solid #15bed1; border-bottom:1px solid #15bed1;border-right:1px solid #cee6e6; width:225px; 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{ height:33px;border-top:1px solid #15bed1; border-bottom:1px solid #15bed1;border-right:1px solid #cee6e6; width:225px; 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_content{ width:615px;padding-left: 6px;}

From 683625066ea24bde979ff44705024dd424634d79 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 22 Jan 2015 15:16:15 +0800
Subject: [PATCH 129/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=9B=E5=85=A5?=
 =?UTF-8?q?=E6=9C=AA=E6=89=B9=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E5=90=8E=EF=BC=8C=E8=80=81=E5=B8=88=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E8=AF=84=E5=88=86=E4=B9=8B=E5=90=8E=E6=8E=92=E5=BA=8F=E4=BC=9A?=
 =?UTF-8?q?=E5=9B=9E=E5=88=B0=E9=BB=98=E8=AE=A4=E6=8E=92=E5=BA=8F=E9=A2=9D?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_attach_controller.rb | 5 +++--
 app/views/homework_attach/_addjour.html.erb   | 2 +-
 app/views/homework_attach/_homework.html.erb  | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/controllers/homework_attach_controller.rb b/app/controllers/homework_attach_controller.rb
index 8b9bf9099..8e69d1d72 100644
--- 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,
diff --git a/app/views/homework_attach/_addjour.html.erb b/app/views/homework_attach/_addjour.html.erb
index 48beebdf8..78514daca 100644
--- 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
diff --git a/app/views/homework_attach/_homework.html.erb b/app/views/homework_attach/_homework.html.erb
index c2b87832c..fca25e8ee 100644
--- 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 %>

From 432e3a05f2be310b92d0577a37d36e8d707ddafd Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Thu, 22 Jan 2015 16:30:21 +0800
Subject: [PATCH 130/142] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=B4=E5=90=A7?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=EF=BC=8C=E5=8F=91=E5=B8=96=E6=97=B6=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E9=82=AE=E4=BB=B6=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E3=80=8A=E9=82=AE=E4=BB=B6=E9=87=8D=E5=8F=91=E5=A4=9A?=
 =?UTF-8?q?=E6=AC=A1=E3=80=8Bbug=20Signed-off-by:=20alan=20<547533434@qq.c?=
 =?UTF-8?q?om>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/forums_controller.rb          |  13 +-
 app/models/forum.rb                           |   7 +-
 app/models/forum_observer.rb                  |   8 ++
 app/models/mailer.rb                          | 130 ++++++++++++++----
 app/models/memo.rb                            |   8 +-
 app/models/memo_observer.rb                   |   8 ++
 app/models/project.rb                         |   2 +-
 app/views/mailer/forum_add.html.erb           |   4 +
 app/views/mailer/forum_add.text.erb           |   4 +
 app/views/mailer/forum_message_added.html.erb |   4 +
 app/views/mailer/forum_message_added.text.erb |   5 +
 app/views/mailer/message_posted.html.erb      |   8 +-
 config/locales/en.yml                         |   2 +
 config/locales/zh.yml                         |   2 +
 lib/redmine/notifiable.rb                     |   2 +
 spec/models/forum_observer_spec.rb            |   5 +
 spec/models/memo_observer_spec.rb             |   5 +
 17 files changed, 178 insertions(+), 39 deletions(-)
 create mode 100644 app/models/forum_observer.rb
 create mode 100644 app/models/memo_observer.rb
 create mode 100644 app/views/mailer/forum_add.html.erb
 create mode 100644 app/views/mailer/forum_add.text.erb
 create mode 100644 app/views/mailer/forum_message_added.html.erb
 create mode 100644 app/views/mailer/forum_message_added.text.erb
 create mode 100644 spec/models/forum_observer_spec.rb
 create mode 100644 spec/models/memo_observer_spec.rb

diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb
index 03d1454ef..54b8c6305 100644
--- 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
+    if @forum.save
+      respond_to do |format|
 
-    respond_to do |format|
-      if @forum.save
-        format.html { redirect_to @forum, notice: l(:label_forum_create_succ) }
-        format.json { render json: @forum, status: :created, location: @forum }
-      else
+          format.html { redirect_to @forum, notice: l(:label_forum_create_succ) }
+          format.json { render json: @forum, status: :created, location: @forum }
+      end
+
+    else
+      respond_to do |format|
         flash.now[:error] = "#{l :label_forum_create_fail}: #{@forum.errors.full_messages[0]}"
         format.html { render action: "new" }
         format.json { render json: @forum.errors, status: :unprocessable_entity }
diff --git a/app/models/forum.rb b/app/models/forum.rb
index 61ba528a0..eb8bb19d2 100644
--- 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
diff --git a/app/models/forum_observer.rb b/app/models/forum_observer.rb
new file mode 100644
index 000000000..1c514d6ab
--- /dev/null
+++ 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
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 2cd069175..02684a187 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -26,7 +26,37 @@ class Mailer < ActionMailer::Base
   def self.default_url_options
     { :host => Setting.host_name, :protocol => Setting.protocol }
   end
-  
+
+  # 贴吧新建贴吧发送邮件
+  # example Mailer.forum(forum).deliver
+  def forum_add(forum)
+
+    redmine_headers 'Forum' => forum.id
+    @forum = forum
+    @author = forum.creator
+    recipients = forum.creator.mail
+    # cc = wiki_content.page.wiki.watcher_recipients - recipients
+
+    @forum_url = url_for(:controller => 'forums', :action => 'show', :id => forum.id)
+    mail :to => recipients,:subject => "[ #{l(:label_forum)} : #{forum.name} #{l(:notice_successful_create)}]"
+
+  end
+
+  def forum_message_added(memo)
+    @memo = memo
+    redmine_headers 'Memo' => memo.id
+    @forum = memo.forum
+    @author = memo.author
+    recipients ||= []
+    mems = memo.self_and_siblings
+    mems.each do |mem|
+      recipients << mem.author.mail unless recipients.include? mem.author.mail
+    end
+    # cc = wiki_content.page.wiki.watcher_recipients - recipients
+
+    @memo_url = url_for(forum_memo_url(@forum, (@memo.parent_id.nil? ? @memo : @memo.parent_id)))
+    mail :to => recipients,:subject => "[ #{l(:label_message_plural)} : #{memo.subject} #{l(:label_memo_create_succ)}]"
+  end
   # Builds a Mail::Message object used to email recipients of the added journals for message.
 
   # 留言分为直接留言，和对留言人留言的回复
@@ -282,7 +312,7 @@ class Mailer < ActionMailer::Base
         recipients = container.notified_users.select { |user| user.allowed_to?(:view_files, container) }.collect { |u| u.mail }
       when 'Course'
         added_to_url = url_for(:controller => 'files', :action => 'index', :course_id => container)
-        added_to = "#{l(:label_course)}: #{container}"
+        added_to = "#{l(:label_course)}: #{container.name}"
         recipients = container.notified_users.select { |user| user.allowed_to?(:view_files, container) }.collect { |u| u.mail }
       when 'Version'
         added_to_url = url_for(:controller => 'files', :action => 'index', :project_id => container.project)
@@ -323,13 +353,25 @@ class Mailer < ActionMailer::Base
   #   news_added(news) => Mail::Message object
   #   Mailer.news_added(news).deliver => sends an email to the news' project recipients
   def news_added(news)
-    redmine_headers 'Project' => news.project.identifier
-    @author = news.author
-    message_id news
-    @news = news
-    @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
-    mail :to => news.recipients,
-      :subject => "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
+
+    if news.project
+      redmine_headers 'Project' => news.project.identifier
+      @author = news.author
+      message_id news
+      @news = news
+      @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
+      mail :to => news.recipients,
+        :subject => "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
+    elsif  news.course
+      redmine_headers 'Course' => news.course.id
+      @author = news.author
+      message_id news
+      @news = news
+      recipients = news.course.notified_users.select { |user| user.allowed_to?(:view_files, news.course) }.collect { |u| u.mail }
+      @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
+      mail :to => recipients,
+           :subject => "[#{news.course.name}] #{l(:label_news)}: #{news.title}"
+    end
   end
 
   # Builds a Mail::Message object used to email recipients of a news' project when a news comment is added.
@@ -339,15 +381,28 @@ class Mailer < ActionMailer::Base
   #   Mailer.news_comment_added(comment) => sends an email to the news' project recipients
   def news_comment_added(comment)
     news = comment.commented
-    redmine_headers 'Project' => news.project.identifier
-    @author = comment.author
-    message_id comment
-    @news = news
-    @comment = comment
-    @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
-    mail :to => news.recipients,
-     :cc => news.watcher_recipients,
-     :subject => "Re: [#{news.project.name}] #{l(:label_news)}: #{news.title}"
+    if news.project
+      redmine_headers 'Project' => news.project.identifier
+      @author = comment.author
+      message_id comment
+      @news = news
+      @comment = comment
+      @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
+      mail :to => news.recipients,
+       :cc => news.watcher_recipients,
+       :subject => "Re: [#{news.project.name}] #{l(:label_news)}: #{news.title}"
+    elsif news.course
+      redmine_headers 'Course' => news.course.id
+      @author = comment.author
+      message_id comment
+      @news = news
+      @comment = comment
+      @news_url = url_for(:controller => 'news', :action => 'show', :id => news)
+      recipients = news.course.notified_users.select { |user| user.allowed_to?(:view_files, news.course) }.collect { |u| u.mail }
+
+      mail :to => recipients,
+           :subject => "[#{news.course.name}] #{l(:label_news)}: #{news.title}"
+    end
   end
 
   # Builds a Mail::Message object used to email the recipients of the specified message that was posted.
@@ -356,18 +411,33 @@ class Mailer < ActionMailer::Base
   #   message_posted(message) => Mail::Message object
   #   Mailer.message_posted(message).deliver => sends an email to the recipients
   def message_posted(message)
-    redmine_headers 'Project' => message.project.identifier,
-                    'Topic-Id' => (message.parent_id || message.id)
-    @author = message.author
-    message_id message
-    references message.parent unless message.parent.nil?
-    recipients = message.recipients
-    cc = ((message.root.watcher_recipients + message.board.watcher_recipients).uniq - recipients)
-    @message = message
-    @message_url = url_for(message.event_url)
-    mail :to => recipients,
-      :cc => cc,
-      :subject => "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
+    if message.project
+      redmine_headers 'Project' => message.project.identifier,
+                      'Topic-Id' => (message.parent_id || message.id)
+      @author = message.author
+      message_id message
+      references message.parent unless message.parent.nil?
+      recipients = message.recipients
+      cc = ((message.root.watcher_recipients + message.board.watcher_recipients).uniq - recipients)
+      @message = message
+      @message_url = url_for(message.event_url)
+      mail :to => recipients,
+        :cc => cc,
+        :subject => "[#{message.board.project.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
+    elsif message.course
+      redmine_headers 'Course' => message.course.id,
+                      'Topic-Id' => (message.parent_id || message.id)
+      @author = message.author
+      message_id message
+      references message.parent unless message.parent.nil?
+      recipients = message.course.notified_users.select { |user| user.allowed_to?(:view_files, message.course) }.collect { |u| u.mail }
+      cc = ((message.root.watcher_recipients + message.board.watcher_recipients).uniq - recipients)
+      @message = message
+      @message_url = url_for(message.event_url)
+      mail :to => recipients,
+           :cc => cc,
+           :subject => "[#{message.board.course.name} - #{message.board.name} - msg#{message.root.id}] #{message.subject}"
+    end
   end
 
   # Builds a Mail::Message object used to email the recipients of a project of the specified wiki content was added.
diff --git a/app/models/memo.rb b/app/models/memo.rb
index cfc509923..f9482911a 100644
--- 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
diff --git a/app/models/memo_observer.rb b/app/models/memo_observer.rb
new file mode 100644
index 000000000..66cabe923
--- /dev/null
+++ 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
diff --git a/app/models/project.rb b/app/models/project.rb
index 14763347f..01e6cd91c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -600,7 +600,7 @@ class Project < ActiveRecord::Base
   # Returns the users that should be notified on project events
   def notified_users
     # TODO: User part should be extracted to User#notify_about?
-    members.select {|m| m.principal.present? && (m.mail_notification? || m.principal.mail_notification == 'all')}.collect {|m| m.principal}
+    members.select {|m| m.principal.present? && (m.mail_notification? || m.principal.mail_notification == 'all' || m.principal.mail_notification == 'only_my_events' ||m.principal.mail_notification == 'selected')}.collect {|m| m.principal}
   end
 
   # Returns an array of all custom fields enabled for project issues
diff --git a/app/views/mailer/forum_add.html.erb b/app/views/mailer/forum_add.html.erb
new file mode 100644
index 000000000..8da8b7891
--- /dev/null
+++ b/app/views/mailer/forum_add.html.erb
@@ -0,0 +1,4 @@
+<h1><%= link_to(h(@forum.name), @forum_url) %></h1>
+<em><%=h @forum.creator.name %></em>
+
+<%= @forum.description.html_safe %>
\ No newline at end of file
diff --git a/app/views/mailer/forum_add.text.erb b/app/views/mailer/forum_add.text.erb
new file mode 100644
index 000000000..ba7246a49
--- /dev/null
+++ b/app/views/mailer/forum_add.text.erb
@@ -0,0 +1,4 @@
+<%= @forum_url %>
+<%= @author.name %>
+
+<%= @forum.description %>
diff --git a/app/views/mailer/forum_message_added.html.erb b/app/views/mailer/forum_message_added.html.erb
new file mode 100644
index 000000000..743c06ae7
--- /dev/null
+++ b/app/views/mailer/forum_message_added.html.erb
@@ -0,0 +1,4 @@
+<h1><%= link_to(h(@memo.subject), @memo_url) %></h1>
+<em><%=h @memo.author.name %></em>
+
+<%= @memo.content.html_safe %>
\ No newline at end of file
diff --git a/app/views/mailer/forum_message_added.text.erb b/app/views/mailer/forum_message_added.text.erb
new file mode 100644
index 000000000..bd084cd40
--- /dev/null
+++ b/app/views/mailer/forum_message_added.text.erb
@@ -0,0 +1,5 @@
+<%= @memo_url %>
+<%= @author.name %>
+
+<%= @memo.subject %>
+<%= @memo.content %>
diff --git a/app/views/mailer/message_posted.html.erb b/app/views/mailer/message_posted.html.erb
index f43a8cf0f..4bb487405 100644
--- a/app/views/mailer/message_posted.html.erb
+++ b/app/views/mailer/message_posted.html.erb
@@ -1,4 +1,10 @@
-<h1><%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url) %></h1>
+<h1>
+  <% if @message.project %>
+      <%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url) %>
+  <% elsif @message.course %>
+      <%=h @message.board.course.name %> - <%=h @message.board.name %>: <%= link_to(h(@message.subject), @message_url) %>
+  <% end %>
+</h1>
 <em><%=h @message.author %></em>
 
 <%= textilizable(@message, :content, :only_path => false) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d25ba6ae2..ab248a062 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -568,6 +568,8 @@ en:
   label_document_new: New document
   label_document_plural: Documents
   label_document_added: Document added
+  label_forum_message_added: Message added
+  label_forum_add: Forum added
   label_document_public_info: "If you don't choose public, only the project's members can see the document."
   label_role: Role
   label_role_plural: Roles
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index bd6c6dc22..815dd6fa1 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -581,6 +581,8 @@ zh:
   label_document_new: 新建文档
   label_document_plural: 文档
   label_document_added: 文档已添加
+  label_forum_message_added: 发帖成功
+  label_forum_add: 贴吧创建成功
   label_document_public_info: （打钩为公开，不打钩则不公开，若不公开，仅项目成员可见该文档。）
   label_role: 角色
   label_role_plural: 角色
diff --git a/lib/redmine/notifiable.rb b/lib/redmine/notifiable.rb
index 88ca9d776..42a81980f 100644
--- a/lib/redmine/notifiable.rb
+++ b/lib/redmine/notifiable.rb
@@ -20,6 +20,8 @@ module Redmine
       notifications << Notifiable.new('message_posted')
       notifications << Notifiable.new('wiki_content_added')
       notifications << Notifiable.new('wiki_content_updated')
+      notifications << Notifiable.new('forum_add')
+      notifications << Notifiable.new('forum_message_added', 'forum_add')
       notifications
     end
   end
diff --git a/spec/models/forum_observer_spec.rb b/spec/models/forum_observer_spec.rb
new file mode 100644
index 000000000..76d68fafa
--- /dev/null
+++ b/spec/models/forum_observer_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe ForumObserver do
+  pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/memo_observer_spec.rb b/spec/models/memo_observer_spec.rb
new file mode 100644
index 000000000..82603ba7a
--- /dev/null
+++ b/spec/models/memo_observer_spec.rb
@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe MemoObserver do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

From 90a81ee1f17d204bf5afc9da8d4c7bc3c102cf21 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 22 Jan 2015 17:03:01 +0800
Subject: [PATCH 131/142] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BD=91=E7=AB=99?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A6=96=E9=A1=B5=E5=8A=A0=E5=85=A5=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/projects_controller.rb    | 10 ++-
 app/views/projects/_join_project.html.erb | 83 +++++++++++++++++++++++
 app/views/projects/join_project.js.erb    |  9 +++
 app/views/welcome/index.html.erb          |  3 +
 config/locales/zh.yml                     |  1 +
 config/routes.rb                          |  4 ++
 6 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 app/views/projects/_join_project.html.erb
 create mode 100644 app/views/projects/join_project.js.erb

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 24a3ff19f..a2e793a10 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -35,7 +35,7 @@ class ProjectsController < ApplicationController
 # edit
   before_filter :authorize1, :only => [:show]
 #
-  before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches]
+  before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches,:join_project]
   # before_filter :authorize, :except => [:new_join, :new_homework, :homework, :statistics, :search, :watcherlist, :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy, :member, :focus, :file, 
   #               :statistics, :feedback, :course, :enterprise_course, :course_enterprise, :project_respond, :share,
   #               :show_projects_score, :issue_score_index, :news_score_index, :file_score_index, :code_submit_score_index, :projects_topic_score_index]
@@ -917,6 +917,14 @@ class ProjectsController < ApplicationController
       end
     end
   end
+
+  #加入私有项目
+  def join_project
+    respond_to do |format|
+      format.js
+    end
+  end
+
   private
 
   def memberAccess
diff --git a/app/views/projects/_join_project.html.erb b/app/views/projects/_join_project.html.erb
new file mode 100644
index 000000000..c7ce29dae
--- /dev/null
+++ b/app/views/projects/_join_project.html.erb
@@ -0,0 +1,83 @@
+<!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>
+      #popbox{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+      #popbox div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margin:0; padding:0;}
+      #popbox div,img,tr,td{ border:0;}
+      #popbox table,tr,td{border:0; cellspacing:0; cellpadding:0;}
+      #popbox ul,li{ list-style-type:none}
+      #popbox .cl{ clear:both; overflow:hidden; }
+      #popbox a{ text-decoration:none; }
+      #popbox a:hover{ }
+
+      .alert_box {width:400px;height:200px;position:fixed;z-index:1002;left:50%;top:40%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81; padding:5px; overflow:auto; }
+      #popbox{width:400px;height:200px;}
+      .alert .C{width:388px;height:200px;position:absolute;left:5px;top:5px;  }
+      .C_top{ margin-top:20px; width:368px; height:100px; background:#e9e9e9; padding:0px 60px  !important;  }
+      .C_top h2{ color:#1c1d1d; font-size:24px; font-style:normal; font-weight:normal;}
+      .C_top p{ color:#a9aaaa; line-height:22px;}
+      .C_form{ margin:20px 0 0 60px;}
+      .C_form ul li{ font-size:14px; color:#3f3a39; line-height:30px; padding-left: 60px;}
+      .C_form ul li input{ margin-left:20px; border:0px; border:1px solid #e1e1e1; color:#898989; padding-left:5px; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; padding: 0 !important; }
+      .C_form ul li.mB5{ color:#898989; font-size:12px; padding-left:150px;}
+      .width190{ width:190px; height:26px; border-color:#e1e1e1;}
+      .C_form a{ font-size:12px; color:#15bccf; float:left; display:block; height:40px; width:200px;  margin-top:25px;}
+      .C_form a:hover{ text-decoration:underline;}
+      .C_form a.btn{ display:block; width:100px; height:36px; padding-top:4px; text-align: center; background:#15bccf; color:#fff; font-size:14px; margin:20px 20px 0 95px;}
+      .C_form a.btn:hover{ background:#ff821d;}
+  </style>
+  <script type="text/javascript">
+      function submit_form(obj)
+      {
+          hideModal(obj);
+          $("#new-watcher-form").submit();
+          alert("申请成功");
+      }
+
+      function hidden_join_course_form()
+      {
+          hideModal($("#popbox"));
+      }
+  </script>
+</head>
+
+<body>
+<div id="popbox">
+  <div class="C"  >
+    <div class="C_top">
+      <h2>快速进入项目通道</h2>
+      <p>只要持有项目的ID，就可快速申请加入所在项目。项目页面搜索不到的私有项目只能从此通道进入哦！</p>
+    </div>
+    <div class="C_form">
+      <%= form_tag({:controller => 'applied_project',
+                    :action => 'applied_join_project'},
+                   :remote => true,
+                   :method => :post,
+                   :id => 'new-watcher-form') do %>
+          <ul>
+            <li style="padding-top: 15px;">
+              <span class="tips">项&nbsp;目&nbsp;ID：</span>
+              <input type="hidden" name="user_id" value="<%= User.current.id%>">
+              <input class=" width190" name="project_id" id="project_id" type="text" value="" >
+              <input type="text" style="display: none"/>
+            </li>
+            <li class="mB5">项目ID是所在项目网址中显示的序号</li>
+            <li>
+              <a href="#" class="btn" style="margin-left: 50px;" onclick="submit_form(this);">
+                <%= l(:label_new_join)  %>
+              </a>
+              <a href="#" class="btn" style="margin-left: 20px;" onclick="hideModal(this);">
+                <%= l(:button_cancel)%>
+              </a>
+            </li>
+          </ul>
+      <% end%>
+    </div>
+  </div><!---- C end---->
+</div>
+</body>
+</html>
+
diff --git a/app/views/projects/join_project.js.erb b/app/views/projects/join_project.js.erb
new file mode 100644
index 000000000..f3bdfb50a
--- /dev/null
+++ b/app/views/projects/join_project.js.erb
@@ -0,0 +1,9 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/join_project') %>');
+showModal('ajax-modal', '510px');
+$('#ajax-modal').css('height','260px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
+        "<a href='#' onclick='hidden_join_course_form();'><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("alert_box");
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index 0dc62c6a3..3e341bd27 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -66,6 +66,9 @@
                                             :course => 0,
                                             :project_type =>( @project_type||=0)},
                     :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
+          &nbsp;&nbsp;&nbsp;&nbsp;
+          <%= link_to l(:label_join_project), join_project_projects_path ,:remote => true, :class => 'icon icon-add' %>
+          &nbsp;&nbsp;&nbsp;&nbsp;
       <% end %>
     </span>
 	<div class="d-p-projectlist-box">
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index bd6c6dc22..fbdee1d1f 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2282,4 +2282,5 @@ zh:
   label_answer: 答案：
   label_poll_answer_valid_result: 以上为有效问答题答案！
   label_answer_total: 总计：
+  label_join_project: 加入项目
 
diff --git a/config/routes.rb b/config/routes.rb
index 524373378..65498e4ec 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -377,6 +377,10 @@ RedmineApp::Application.routes.draw do
       match 'copy', :via => [:get, :post]
     end
 
+    collection do
+      match 'join_project', :via => [:get, :post]
+    end
+
     #by young
     match '/member', :to => 'projects#member',  :as => 'member', :via => :get
     match '/file', :to => 'projects#file',  :as => 'file', :via => :get

From 8f1249390a46a1804fc8bd659cdbc451f070a741 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Thu, 22 Jan 2015 17:31:34 +0800
Subject: [PATCH 132/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=8A=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E5=A4=9A=E5=B0=81=E7=9B=B8=E5=90=8C=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E3=80=8B=20Signed-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/mailer.rb                 | 11 ++++++++---
 app/models/project.rb                |  2 +-
 app/views/mailer/issue_edit.html.erb |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 02684a187..23ac36054 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -147,8 +147,10 @@ class Mailer < ActionMailer::Base
      @project_url = url_for(:controller  => 'projects', :action => 'show', :id => issue.project_id,  :token => @token.value)
 
       @user_url = url_for(my_account_url(user,:token => @token.value))
-
-    cc = issue.watcher_recipients - issue.recipients
+    cc = nil
+    if recipients == issue.recipients[0]
+      cc = issue.watcher_recipients - issue.recipients
+    end
     subject = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] (#{issue.status.name}) #{issue.subject}"
     mail(:to => recipients,
          :cc => cc,
@@ -197,8 +199,11 @@ class Mailer < ActionMailer::Base
 
 
     # Watchers in cc
+    cc = nil
+    if recipients == journal.recipients[0]
+      cc = journal.watcher_recipients - journal.recipients
+    end
 
-    cc = journal.watcher_recipients - journal.recipients
     s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue_id}] "
     s << "(#{issue.status.name}) " if journal.new_value_for('status_id')
     s << issue.subject
diff --git a/app/models/project.rb b/app/models/project.rb
index 01e6cd91c..14763347f 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -600,7 +600,7 @@ class Project < ActiveRecord::Base
   # Returns the users that should be notified on project events
   def notified_users
     # TODO: User part should be extracted to User#notify_about?
-    members.select {|m| m.principal.present? && (m.mail_notification? || m.principal.mail_notification == 'all' || m.principal.mail_notification == 'only_my_events' ||m.principal.mail_notification == 'selected')}.collect {|m| m.principal}
+    members.select {|m| m.principal.present? && (m.mail_notification? || m.principal.mail_notification == 'all')}.collect {|m| m.principal}
   end
 
   # Returns an array of all custom fields enabled for project issues
diff --git a/app/views/mailer/issue_edit.html.erb b/app/views/mailer/issue_edit.html.erb
index 6fcb0ddb5..af167cff5 100644
--- a/app/views/mailer/issue_edit.html.erb
+++ b/app/views/mailer/issue_edit.html.erb
@@ -12,7 +12,7 @@
   <span style="float: left"><strong><%= l(:field_content)%>：</strong></span><span style="float: left; width: 540px"><%= @journal.notes %></span>
 </div>
 <div class="cl"></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)  %> </div>

From 84bfd30fc510ec57dd044ef2bad5664ba1142261 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 22 Jan 2015 17:46:12 +0800
Subject: [PATCH 133/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=8F=8D=E9=A6=88=E5=BC=B9=E6=A1=86=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_feedback.html.erb | 289 ++++++++++++----------
 config/locales/zh.yml                     |   3 +-
 public/images/blue_line.png               | Bin 0 -> 2819 bytes
 public/images/sidebar_bg.png              | Bin 0 -> 9419 bytes
 4 files changed, 164 insertions(+), 128 deletions(-)
 create mode 100644 public/images/blue_line.png
 create mode 100644 public/images/sidebar_bg.png

diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb
index 52006e94d..ae85d9479 100644
--- 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">
+	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{ }
+div,img,tr,td,table{ border:0;}
+ol,ul,li{ list-style-type:none}
+.cl{ clear:both; overflow:hidden; }
+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;  color:#fd6e2a; 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();
+(function($){
+    $.fn.fix = function(options){
+        var defaults = {
+            float : 'left',
+			minStatue : false,
+			skin : 'blue',
+			durationTime : 1000	
+        }
+        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    //�˶����������붯������
+	            });
+			});	
+			//close�¼�
+			closeBtn.bind("click",function(){
+				sideContent.animate({width: '0px'},"fast");
+            	show_btn.stop(true, true).delay(300).animate({ width: '25px'},"fast");
 			});
-		},2500);
-	}
-	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();
-			});
-		},1000);
-	};
-};
+			//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,54 @@ function f_submit()
 }
 </script>
 
-<style type="text/css">
-/*浮窗*/
-/*body{ height:3000px; font-family:'微软雅黑';}*/
-/*div,ul,li,body,h3,p{margin:0; padding:0;}*/
-    #roll 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>
+<!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=gb2312" />
+<title>意见反馈</title>
+<link href="css/sidebar.css" rel="stylesheet" type="text/css" />
+<script type="text/javascript" src="js/jquery-1.8.0.min.js"></script>
+<script type="text/javascript" src="js/sidebar.js"></script>
 </head>
-
-<body>
-<div id="roll">
-<div  class="opnionBox">	
-	
-	<% get_memo %>
-		<%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
-	    <div class="actions" style="max-width:680px;">
-		<p style="margin:0; padding:0;">
-          <%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%>
-        </p>
-        <p style="margin:0; padding:0;">
-          <%= 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>
-		<% end %>
-	</div>
-	
-
-    </form>
-    <div class="clear"></div>
+<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|  %>
+         		    <%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%>        
+          			<%= f.hidden_field :content, :required => true ,:value=>'该贴来自用户反馈！'%>
+		  			 <%#= 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>          			
+				  <% end %>   			   			                
+                </div>                               
+                <div class="msgserver">
+                    <p>                    	                                    	
+                   	<a href="http://user.trustie.net/users/12/user_newfeedback"><%= l(:label_technical_support) %>黄井泉</a></br>
+                    <a href="http://user.trustie.net/users/34/user_newfeedback"><%= 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>
-
-<div class="opnionCall">
-	<div class="tectitle">技术支持：</div>
-    <p style="margin:0; padding:0;" ><%= 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> 
+<!-- ´úÂë ½áÊø -->
+<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>
-
+</html>
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index bd6c6dc22..fad70aabd 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -2282,4 +2282,5 @@ zh:
   label_answer: 答案：
   label_poll_answer_valid_result: 以上为有效问答题答案！
   label_answer_total: 总计：
-
+  label_technical_support: 技术支持：
+  label_feedback: 意见反馈
diff --git a/public/images/blue_line.png b/public/images/blue_line.png
new file mode 100644
index 0000000000000000000000000000000000000000..4ae87f34320f80b3839409e80f275f205369f5e8
GIT binary patch
literal 2819
zcmV+e3;gtnP)<h;3K|Lk000e1NJLTq005c*0006A1^@s6pvuKL00009a7bBm000XU
z000XU0RWnu7ytkYO=&|zP*7-ZbZ>KLZ*U+<Lqi~Na&Km7Y-Iodc-oy)cUY767Czti
zWe-+D*zmEJY=HnGBdiF>5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1<Rh~l6qxMx9%
zh+2zPTsZC@+^4mDdhhM+``7!t=bY#K&Uw!dfDsZVk>;Xm069{HJUZAPk55R%$-RIA
z6-eL&AQ0xu!e<4=008g<d3b(wus{3(uWtYX0C3eVBofEr|AV?vCRYF;kpSQ#66Xs6
zkWv81E>y@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e
zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5
z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7}
z<RYAxn<EoQ=L1a63;+Nc`O(4tI6si*=H%h#X6J10^u?n7Yw&L(J|Xen{=AF=1OO0D
z&+pn_<>l4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf
zVxhe-<BLB3GvROGi+=X}Kpy_vdhh^onn0PYz@vlxaba$Du2PQY%LGC(ZujRS{>O!X
z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4
ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR
z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#<bWIsp%|7y8C1YJ*aWq(0~(+a
zn&A+%!7(@u=im}tf$MM=24EPT!Wg`U2?RmN2oqr;I*1Wsj@Tm32p5@-1R`NbG?IX%
zAnAw{Q6k02a-;&OLTZs+NF(wsauhj@TtNDe+sGg?iu{VaM=_LvvQY!n0(C&Ss2>`N
z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd
zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS=
zB9o|3v?Y2H`NVi)I<b&gMyw|8As!)~C0-{E6JL`^Bo4`v<W349C6F>n3rTB8+ej^>
zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv
zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&G<BLK&6^fO%cL!%)zF%0XKD9nFX?o;
z3EhJpMVHW*(rf4k>F4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^
zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN
zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS
zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^#<Ae=IoX^_&LPeX&U-BbEk7->
z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ib<gTP(_`y-
z=?V49^$zLX(MR=d^rQ6`>hIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyE<W%V@fh
z#Au_@NuwvYChmu4<285}K4z?M9Ad0A-euftJYiyKGTWrYq{ZaEDb18?nr6Duw9|CV
z%*ZU<tk|r{?2b9roNJz8zS+Fn{EdaBMV!S-i#ChLmfDtl%LSHAmiMffRz6mFR`pib
ztVz~f>n!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>><a9f>;~;Q
z_F?uV_HFjh9n2gO9o9Q^JA86<b<B2baJ=iJ;WWdk#HqvSS7#e%p>v({H5aB!kjoO6
zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a
zam?eLr<<q3^N{B+UUpttUi-ZsPqUmRp4KpJ$lJtQ;JwRxU^+fMW%|zP13tz+0-t)H
zhrXu1BHul}BYxI?nSKZSp8Grc%l(h|zu|fE7V%C6U;)7a<pI5c8iBI|YXctynFOT=
zH3f|Yy9O@|J{3X?2@P2va+7bs7xEkVV>8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT
zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^H<bj`5GFjJZ48
zYPNEAXRK;$Qfy=Fo4A0us<?r8hxkSDmlAXnBnj<_<iyy-J&EIU0_SX+Go0j_RF-sO
zuI1dKxfkZ?&dZ*6JXtkakbF3Wm=c$=KjniULQpRlPvxg>O&t^Rgqwv=MZThqqEWH8
zxJo>d=ABlR_Bh=;eM9<ahEGOy#xn^|QY(3p8Irjp^G#Mn*50ho*>Tw|Ih34~oTE|=
zX_mAr*D$vzw@+p(E0Yc6dFE}(8<U61_v9n_bMxC3Y=unGqqI`4P!1MMFQ_YcTNqn-
zxJbQ7TGTV&X8!8=BMX8Se7%scP`I$O*tmFE@!%rAMY|Rwi&GbOE-_tFx@351@X~$D
zXv?ye{ZQgqQdRP5dED}jQiIZ^r9&%%S2UHWl*!9(uJl^DV-;bQWL58Km(^QVe<~N1
zU#xJfsIK_1M!4qUS59BmeD!&4+S=Yqx61A7Nb98QZmjoNzpqNYYC+Y|hVTuo8}W_h
z8((co-gKdQYW0rIw9U%R12tha?OV*YtlRRTHly}>oqt`+R{gE3x4zjX+Sb3_cYE^=
zgB=w+-tUy`ytONMS8KgRef4hA?t<Nq8e$u|zvh13xJP$S#h#CQrF#eVMeplsbZ>0j
zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3?
zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j<Jb;mW2SDv7qC_VA{<bspqr(~y|
zolZYJ)S29Q_e}hmYh6)Yy=Ozuo<A3K?o78|_sR3#=Z{_Rym0g)_hQ>6w@a-(u02P7
zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W
z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU
zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R
za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)}
z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>R<o>I+y?e7jKeZ#YO-C
z05C~JK~#9!VietT{yzf)1H&t41BOvB3aAal_FiCMU|?Wi8V!n3Ko0-_009600{|>P
V1*1Is;UEA2002ovPDHLkV1lWASCaq$

literal 0
HcmV?d00001

diff --git a/public/images/sidebar_bg.png b/public/images/sidebar_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..e41ea789d541cffeab9bdeed534fd1ffb17830da
GIT binary patch
literal 9419
zcmZ8{2Q*w=)b=2v_ugd$(R*|fB}51zdN<LH-n$4PqW7L4M6{@*8$F^0QNpOBL<Xam
z82ne>e|>9x-&!+w?%aFk+_U$7_I{py*2L;OS0f>0Bm{v#Bu~{<bU`4jGvNF+{$1c`
zx*M?yd=R*+8+(C3L{ztLEKp7!JqSdo<*2NzqvPP_?dIj+=Fa|9S()A4)6LG&#TEqe
zpU>CxGfF+9Raic=B{NW(+po=Zi2#8)D)GOO8yAtMfUMt;Q$FgCiXk+hrlH7F*YA5h
zO{kt9v-aUZv;E_DF(z^PW>R}>h_c3zK=khJ<?LnqR^Aq7EMS~0oPv@od9%m~B&{1I
zCo{*EsIA^N)DezNqrP&7oqTh+#~!yI1lq?5@DKI=s))g=aRXt4+@}TaQx2})M7HX1
z8G_i8K`UU&Eh4NWUC=kdm*1#C-{?VK_3B>{g3>@Bmw;d;Fz5>jXy^E;0xoE-JQYC)
znk!;1#|On@fwCW{-N$~^2C~wR(B;R5_kccBJ^~BgfmdUN8#jrnVTX6%f_xK<lE@xe
zfx@$u_(wqOQrIA6R;p1Pc1@fQ!joMq<(BSI&FWYn_;C7Y=CesL>gMzxjDCmvD{J@G
zdR%Iitm$~j?FiPvd6~H!RO(wenq$Nu5aY!}_qCK_($?ns>ZaY63;MXf=-PST4XkkQ
zVEMZJJ@y?C`SWq~yyeEm437IC)>oe{=W<ifyaC8z`NCXmf#8D);g7(JxBw~4Bi4eC
zI^X12m<fr9b~$Z6b_gTm6mG;;-B#j4Pl3DF3xWF}kDN!@Rq*1-D-UZ|-)h~2t>HUL
zBCcm!9M^+UVOI$}6KmqNX8bho4vb=(b--GK0WG@8D))xc*C@BcL=V_9t_V{7NI;d*
z+VJO1c#Xp@@X$Rh>^M@RNng;T&?ABOj6}&Ga(i*n003>NT^EUu_^?2unI%XNsQov+
z+2=Gm%>jH6NaaHW@7Kq8#NE`DaMHYPmUcKDw)I_=N5uExa^y;P*Tb0!KhkGBW_Ssg
znY+{Y6^HQyMb0XDL$`<&$<_*`Sp>?R?yePmK@WX<G{K$6-|(rd@5#ha*d)w>$MEU0
z6YhYm)x}f7OW3z#s9%8lzj>Bmmn%6Xo2zpi3V2dW$D2L+o3!waUGyF1UAvk{T14Fo
zoS)b}k6J#nF}@r4;5FebPG%mSQRF<q*uW|u-c(dJ@$9#cHz?#?0wjDwgw*c+FKe^+
zZ&j^gjTpHGX(1a%5(bG95EdgzUm7NOfi)WcK6YF<)egSJ8}c5P*GWlgMw&*-pE-9p
z8Yo-w4GALOi1cuSQ$K4ra0XId^!eM!)Fv4{spQ(b$9k`T(}J6n$}&~`KIu@(`g6j2
zoJpcjiJm&EFQ^NY=#?l;k~`*Ua-ou-Lrd%Ub>WrlnaQvuvLx-4%c0(N7`04)%$g=a
z(S6;LG)fH#Tg8n#p9)2lvOj!zF<M^m6aPz$OrgnB=m%dNA-%WdRN_84oTIt4%EKiB
z#nV4>9PJ&?9E7&LTL~5;SyeNCWKKH&#@pW7jy(1wCW$7A98|Y?z~Iaf#85^LV-U*L
zEXAG5%>MRLcvh4t+dhjd%T3>i_mnr7Ciy#Mx=gx3dT9FAmzVlp`ij#5Ux;2-=#y1g
z7=)BQ(XZD*mJ|G>t(Y!n(Qhk%SUsler<<rV{=%}j)AH)|UkFKEbkvg%(dxx7A+Q04
z_<OViqP7P{N;94YI4FMSEG-+;x{Do6U))P3U!fpPJ!P*ic9nL?cKMqgqgbQ^wJZD5
zzw$K3?v0U*1qt8?C<@fhI91tIg;q(<2hMlS+w6Mo((a<>(LV0^kMjBRPh_AnXFde2
z4_jZfMzt>ZjQ>%Xf}jGn2~NJBkZvzdsGUHMi%;nOpl8q%Y?8v__z#m9TtuWG`y)w^
z-_BW%%@g}?RzFh=JG3VEITTMkE#_|K+Iwq{l<=ohu&Z=qwy6|fvPC${S=%^@E|m0@
z^sjgFjHWr~*tJeHOnHxteB(z{&Q%WWBuG!^ITu)W{%T*q#7BKn&Fj~Qdl)yEF`p4U
zjGLjAaaNgSpkNSSaAGi9`E<q%#gBr{7`o^%8Rin_%H$3=eXh!_>hsNoE>o{jC-O}4
zoanjEi|k-_2zPRJ?(RyTTAy;BLQlt8MwlsCW@No(gFU@{Mtoh|+fgN};=Sd4<-Oa6
z_DuF4z4DJF=t`d@4O3?NX42_F%ifi_76uNdZ!qq)PBu=R6z8_(BC38te=d&5_lHzm
zY6<2t4Vm}KqaPpdpBb%rj3D#Na?5&-lD32_d@YPEE<0GY>+`q@W`v>N7WzzAI);O+
zWEA9W|Bh|rC=4iI7X}u-?JVsCFUxmwgwBL!hvH!hE@l4?UnQP*tp*&@9z4gj!s^D_
z!0L!#jHt(P#$mgYediON1a3TT+g%}I1sWw{0up03&r~-!-67KjL=0iipEE)89Y3GO
zgz2yF2$v@73`IipIQ}wus9WiU=JrSve$0xROH4DHBSSXbMF=$yujm)SKQ9{eygj_n
z_-88DjW6vx5)Kl}-?zvvI5m0t+E+Tc=(<35a+|}Ozcfeqzdcty$fWe9x=*khyWTg~
zCm)OS!rpSp5zAZ8d70r2sop>owa{&Dj|~_2$r(!+Ck0DIWl?6<DQ-lvE9nT)Yj2df
zYOzoqzR8W!R_!c`FM3f6Yu1oU*~~XcKb2aP4N?B<5Uu^hXF!ZVTbC~&nIWZx<4DUu
zWoD^z{Flcs0qL~7w7g<n632`NzFA?|1DLiQA73iTdcY?1J5%c0?`P{A7hXpTG%it^
z6U7a>)jFiKnnIuX{7vai{hQT0)J=YhE!$oHx!@prO&i>i^i`+%YyDiazwyBexJ$K-
zmLpD&&QDOpT(|X=zvKR7$gsn3UB;Epnvt&lp;G|jFhMtR^3x|}zSoB0>E&rd!>-lG
zCM^&e>-1OpXs66+Q-d&Gx^&A*_sY-J=U<;RZ>||Wx10_>34qSeFKNKO@1oREB`DX*
zGvlrrjSi>B(?6p3NvfC*;y0Kqp&Cox9|N6E5=I+FzmMWbSWE1hjx<#+9DaOQd>WV^
zW<G3iRaF7&{KYjt)3xXqbVM4-LL<9`PTOg3<nuRl?obUmah=?Iy_m>o!_?Zf8M@f4
z=BM3XkQnqS2=7!CjdJpKb3xQ}b=46-bsxsFs>`@<<c7P==kDhCHM*PdlJ-2_=;mH7
z4Gu!;{QfxBi|8F)&JKf};G@(7_$Fn#d@2Qsp&#TwcA$U1FV1JNU{ULY-Grh=kPx3i
ziA2MK5BU$|4=&bUry|Q<l@;VaSCs#mjR-i?#AG|0zcBBxR~|1=r1Rd>gjt>q9W8Ao
zn(w!}AA`?q7C2$gs^qKX)k58`R@G}v-B7k?!@GuZ)!xTiDA@`0RM=l9__WvT`K+LM
zVL%6ZV226j%C*Sc%-MQ!?t8jR=SR4wi7*dL^sm8m&R_k(`%CsGtl_%W77krGw}M-Z
z_ZpL-NeSK-T&LYky<MGD8&R9)c)}5%n9s(>M8eo{_-ZV5wXCj;YW#bs!A$_lt72>U
zYVGpbxDjS<pXefPysJ8({KyksQC=f6$T7&)J{BN<P>QJ<TL?inqg$5;JJ_-xU>;rT
z98LU%43_=SK2z8VzQzchy*aw%oGcUr)FwMbT~`YP3giTV!XrVTiyPo`8wBzZ27&%q
zfj}}@AP}8fie>*35QyRYsmkM*{_{JF9^MNZA?O1bhp`d6X>#1_cn%SJE@tM`l8^S@
z51CN91}UdY&c9uE-^(`pL6LQW%n$A66TbRzGB|fM`jyz5&IRs$|JYwy7S~ez^tqqX
z@TZ4R^dHW0k^Zc#@4hZYHfl}qC&~NQ{-L_Bj8pQhe(4?u<fo>pcNKPeh9)0g$&Vj}
z6qLPkbxoko#5%)ayIcLWfCy(CWO)~CmS@(F+f3_!XU;{w07oMn3Ev7gJYwIg!RaCh
zR_HxY#JU?1X2(z|>l>Uv<7;<0LrFO2WG2R=5Opn|-1C)d<A6KD*h+GrY6V?od4q+(
zX(z$d#Q7Hjv!3$`gUkrLL0v=$5)6%ddb;q9A8TI+%emM}toR@+)+r9#teUQh%923P
zWFZ^wDM*09Brzy_8LJZu0m4jBE^`=qU?mt=t)ePb@^;?BA@Gw&T_=}s4Mg@LACb71
zP5<qh3Jg`;H~ui#N(u&phf@&f`jj0ZEX8rpYsm;U<Ej}w1JuJ@v;Kak$C6l|9*GYJ
z2w~Y~-3#w(pxk!q3n4nE-!Dn;)5bw&?VZzwo6-g-Qcxsw8sjvJAmIXW_g9(?Ma+L*
zf($c`JZb1Y&`wQv$#dSzC^>%8*Fh3Yeonn&8Pz=Gi)D#*J=dBnbw`}HHZJCyC)e3H
zc1?2Ua67dWAtLV(L-h!Bu9-2{@{S2jA%*2#CKo351FxNX)VZM7yLcH!=%E+SeRa{G
z5Df;`A%?DI!_lv#Lh;Y_SMVGYSo&Xv+ox1CgCw!kCgpD0r*p1dqi0!gm%0c&QsuFO
zCtB|&Vin$HomG3GqLLxjVrkuIpm$ZA{uRMs5rqBu8>OtFN4I9hrExUGRG4N@yG;62
z)Gjah6LMe|8GL|XdBn6YFyh`v^;ha0uyRg6b;YG1PT~BGMv;+rw2LPV?2h{@DFZ@(
zbw#{I>ki*f$k*kH{^WYluxFD;Y&bF^(?{BWIC#KdbOwvqO*`v(W*TG^o+yGGI&riJ
zk{3?p^sQdAS!8af^XJt{37K*tDa+M`(co7pnS~ox8iYN|$t^I4%fht{|KhkW(%8BP
zcI83$hIs^}!@>>+S{`thF0HK}6LZv4gy^ZL5c0Qlfp+@58OmBo&RI)y+PFt+Z!&Km
z@tVixvW7n|bjE@6hvrd#7}5DDZy&B$;ti8=!g7o5&F=zTro!U@$ExaAA=!|LqZ|2S
zu6ziUcY+pqfLdI0Y|MIFN=u70TPbDxFO6oRvD#4WYs)Kx3L3zMjC;2aU>H}7&sOgG
zY15$X9_rHqGnCqUH{6i+M?O^OY}Vj~HB3Ni1|h2+IXu)EFX0HeYX?T$)LR$isw;je
z+OSupE!(iS<*dYt7Ks~>BQh)4%xg)zW0p|Pc$2G2=?=`l4Zb1X_Zi{!jQe#5gJTE1
zgc;u3`%<5tw(pl)y*ge~^)z=5E0C-AI7%!r<~*NN2Ijg_opbg(mjj%#HN>L%an`SL
z{d9?cYZ+e?%RI|xk}kEP*=nZr23*>DMP)qZTpvh&ieqWo-(2x0f<!;K;d?#5B!OkS
zt31rY_@i55jCz5Fh0iXBfi9|_y4?qxTV!!7S47nkjdR_jG5;(bm~3D`+h(Ay3&eca
zqQS<k=lz9Ya)9||dO{m7<~iP(MZK$W5Y{QQa`l&FY3wMCy>=5Jg=&dTifoqPHcl3}
zSz9#B41+sze(_tiT^q32IJ1+go_=IE>${KeH0m<E%l4q$hmXOpKV%LyU{KfI8{9ZH
z?BFgfEplZr5o~<eNIn6DO_-Puty;ybVt0LXc;GiFnIGWrc?enL78tD~UV77^D#+e~
z^B!~~hKIggacMHk*H9WI1WjYp&w|uuw8vcBW}K%;R1Dh7vilNY=#G{!v=vY>Bi&{C
z0!&v|rucPzw!y$~(!{)F{phSyG)Ls%VZewld3-_Cf|7WZ{EZpLfAEJCOW6Qj-a=zl
zLS%1u!yt$hT7f)Wdfdw0`*+!N9Xqwn%;t&E2Z_w`xxK{!ftO7wl$|E%ag&-K_3A~j
zbl}j<4GLDa5TyB)ocY3^NiLo6j6WJCllM^tL&BpSkwgV&(k$YEX5Pf{_BR*9%ndIM
z*TxQiNi|ftt}bF+-oQsL#=pH3&+xBV%~qc`2#Q*Khz=~hye#dUZG{Y;aMHc-6jD%&
z)Z1A&C$)8+c_okj(IkU;KA2+DNnNn9A!#pk;S57W#X#H&k;|bXJ`*0NfT6#m-O8)i
zc`6nZ8&#Kd&4(bpj}z`F$N5@w!%}kP1XK6*3Y?9Vh;9~}J|hJ%r}Mn?&QC`W>esTY
z^9F;;IK{_N_CTxxq<R~)C^-FE*7IZYkTua3_GlqPdpU0E_}VhXN6Ia!gOam$@pQSl
z5H$Q7XV~Il6?tuAD`lb25zV`Stak$r<<<9-enwKd*=nmo-W1iURKU77%-pGxo)-_Q
z20`@)To25gI$BczPc7Q_?r5}T@25*|HZC!J&wrUVzn>|6yg>_?@0!?oDl?s#et2+V
zXeVd?U4uT3^Hed|F>5Q%YD8?AkOCMl-kcXZcyNGT7lBGCY9?WV3q$M<ra6|Np4HVO
zQm>M#VC+k>Uxzl<_fnOa38Ed20;DO4YkN^MnT9Gu=5-f{VGc~tZ>_zWs-nHa;Y}8=
z1t{^7r}E6~nPzl7t-iSvV4DXT{`)m8#wOYx{LHCV=xwwow`}_!E^@Pc>*XAjC?&|*
zhZCr6^T8Iti+ATCc71Zx38-<iv{Xn=ne2!3!^f$EpRi>qIM3EjcMqO+$}0@1RmcT@
zN83KT*f1Us6FVgx*M5FfRr~b%WaL*-tHFgy%$$jN?DF=?kZQ_l^&bsvzAVHU>3gn$
z?y1E)t-B8`S~j8^VsBR5lX?x}IxZ_)ViA5&t@(m*Z{!Z|7b;`97RzYk=O?{cjWbw1
za4~phMBG&&55U9KxUAj$?{Ms{0|?xi&zZMjj^^9VU8EQ;JJhWA^&R?GQMCQB+!ud_
zHCh~ZX)3+a>OS=hu^0w?O;01w%|(t;Da&0ByqpM?epgE_vXmZnuWGfl<W8^@{n~20
zgq)6Pzd85Y&HUNUkA&<{pU~xF;*cq^hKu&tK_DZ<(`4%nwsD*q<M{8jgi-nvpG)tD
zi7eE;HcsDV<(s%--47Go4*@88<nKx0z|QZPZp<`#uYq!N8FW_ViCC!eLWSQXd+tz-
zeDPnljWTR!3c6%AuPJm(zF80|J$Jg2keW$b;c28f$t<QPx&=opQ%0O43EB7)e<zpM
z8GpV9NaB-hJomk9FSXjkPVp$6X*1acKhxezwDDCQZYcS~I+9Vg402_^>fGF3=M{vD
zR7eD~2q$^&yqzKGKbaZrJAwZvTjG5nIz1Nx7H6ih9dAcWzgK5f&yI@*2o5Mht2gvQ
zg@9EF%yZg(Y$l{It>7#Fx&S1FphMQZ6GR72@y>qh#otYnoFF`gg4iEG`Qbr5`K`n$
z<UiF|B{;FMyzcQS-%<#?C7IANu2I+3pgw$%YcPC77NKaQgaHIu{iqX_P7W6qcM!pY
z`jivPY8wPBJkdI%;fkd~awSyL4?_eOfHPg}fAn{?$;l10SZk3iZ9(#CPlP>HI6K5Y
zYd`n8yKK^YVA)Py%l9m0JDb=Gb;I`U*BorYwYa0nX<`rcGQW(wdC>$hV7O_uJiu65
zREw)<4}=qTMyhKKn^<^R=&(50-?o7iIMfk;Qtxw(%yr&wtxX_oi<iHO;1o(kH7#uV
zoDGHzJV`{oz9|6r=O7ldJXUBmVHY+QxS@3Qoq<i)b$~UW`@K)x@QR*}XC`$ftUy;H
z;bov3-af4+qI1Ii!I}8JdmltLt_&8lze%5V$PB;+xQ_+8e?AcJ+@}N#IpWlU1OfS@
z7Dlm#R1AsVT<W&XwcbD9G>Nw7a6#>rb<DiCW+T3n4HTurW+_VI2@facu<S_rD=fsP
zramd(FRQ=s7gMbnzvs(AIah$_5YcuJs6xE8qYpBrC#%bWXdKvlH|Pd%%uEt(WVvaT
zIy^LC6~oc}BZVqxHr|IQbT2=LmfQ33&{aL$nZab{6a2->X4+OE2s?|!T69Ps;hzX6
z_#nG+kt?$BwRFK9Bdsa<H>84GQr}Z`!ZC!Hh;L~5FA}Q>v!d#I)-kXY@uE{gA(_54
zW^{BS5JTO#tT<%O9i8D59Z@sV4YfFHS9M1CGWFI|005#Am}jw&6fmF*0%AkvRyouh
z9ef$h+uAf;+d0zRaTO6zb*d?Fyv~$<jyWEiqB<%-0d*c~A*nY(4^%AIqt<QcmolGZ
zTNfncs8bZrl9ACK%~$MQQ1D@NYs0$2eia~{)~4*-<b^5z3O;bD#9!wu`PnJyI~d;m
zNb$i08(z5BkiJ=XZg|<$f4WxCF7e#E*3A@<)NB1-Z^PM39cr+fpRo=0)G|iJkhy%e
z;blbDJ|Y)}T(worKp!w7hiYR3a=VYU#(zK>M}Typid}%hY8TM9nT>6W-(23bX_Ioc
zPM3{kX9NXP(FyAx$Ft79hPoilFG8&KwwE@~xJ=Hp<F)Q@ZlX_fFHngyxun$qv#7oP
zsDe4ydK|Sl5Vy)Og|dPHW#6uBcJ!~P8rY(Eu>U$<A~?jWN}|fujOGaJm~u&D;4Cq%
zh>afft|{}vZkBkq1K?AvYR{e_0oqNBBS(UPr9p%sO_@N=jJ+X}wv_XGdy<DI##|d6
zrGKo;Zcs#i@T_b=I<LV11B8)vPA6S`-vjXT>22wT<%Wq$)l@8QdEaksmyI3>;3v=X
zYxi<_4bVxa=wQ44Ucz1FU>-+C({|iYcd3|~kz@yBMTv*qna|_LnJm##wo7G=ttm4V
zd{eGQQ}PT2XGeXK@zRXM04FD@uc%cDUZ0Za1H~4gM2$Vb9@!E$bO+_PCN<ml{byq1
z`Upz)slGK`KI_ul$h{Se#UUR9o#s_{WR}yVX-dHj{r>&Zz@=!0)J$w@Ar-`KTZ(M;
zA%9Ru&%Vnmi=G|LdPhx}a>#EW5rS9Lgt%u4wf(MjzsxI7(EH`nYhW}FL@+K}Y|Nyd
zz}gpFpIt5u@y+gTlfA+)Ah&!A3Lc!x@2GlOlL!<2ER&vjzx{A;e19Gl;i9k9@-EKD
zYk!IO>8Zd-kJNVQPbjWZ1v%XcO~v#LlcQ^(ueBX<-Ve39uQVF>)_}!KEUslRa<^=B
zynGgb{)Bn2u>;Ody(EH<5f8fIj9GtanPNc={p*;hYd^&;{!cG){jZnkVi5B!9Lwj2
zYUIbnd@CBd;>${3Q%Kr8e>2S+a&P0pRD`HKSo&Y+_0oJvh~j>9l3{$KXM?f#jcb6w
z2h=#5nh(5lqM+d6_qC$0|M{mLP{lu=wwEK9H?qDQ2qlG34FS0ErxG*YL%|b;aiPCl
zu&=u{`rK-i5bczfNZD+F*a7kG=*MIl-_fC}vcA}e=%x+~8Psq^k9uCm!>NDZVt!Gs
zZ2=UtjAPmN5*7v?4uED!|GA8)sj@*}o*g#o$3{IaV9r(F5p9}6J?BpX8t15Ao{5(+
z=|2M_*dQ5CwU+p8>Gl;?geprqUbeg=vNQShbj1IZF1!~WXRxD{b#TNhTI1X`>0xND
z+#*)HVK+W69M4LJhtsWMJxN-Vt0l;Nn^a@Y5Bz9HS@*!;%-1O`QC=RikWI)9;Z~X7
zsP(|$4K;nox3lj+jU($T6OpaaHyV!$55v07=r5b8@<!yD`tA777eWCBVKf^fdN)m1
z@Ra{a%4qhk=`+HM;iT=HSpG7ln*#M!F29yL{28BHGn#V^j&S+W<?Dh)>w*{E)z5VD
z807_78R<U><#o1obZ@K!LZej&4A$7wRZnYIRY^l^P!?yj#l)nvecrI39&=g#630I5
zx>$>B#RsNnIRdyqCVC)ShOT$Z`-g{9UZME3SKoXHU+2l@^O{^BWlZ{>sFc7fCpaGn
zYO&J60v3-oqst#OPON)S0IadcQZj_>0ch~;>?jV?m)`}%Qx>M5Y#nc(%vsoY(GHB>
zE+7{35gg#kycNcEy{OHhT7pxzN^98ov$I!OW3>bYjJZ0VbQC<oe=>wb$+!fbOi4eC
z7~lTTy;0&=#dm;#^meNlVsuYWXej{MZLB(UY5BIOma|HZ8wjiF;vo=SAf>@zz#!nr
z_XM)1`VHu!bUGXISO1pU<Euhi9d3uDi~~f*Y_eAE4iNPubQc8-2d-|VQ2DiUE=xjZ
za@-D^GlFs0|6P82YVJIf-Ia8;psE6h;SzR-NHPi@?=KmdZ`N^LRa8_2{CM0$%Odyc
z`^}~NZa0lWC~q&e+;84}IFl*uV1g<dLQdjRP`vQWRD$)Q?tYj+7QGlUznzUx`vGII
zy{P5`#$G7w03OX7sJmH*X9ouQp{W&5r(wfeONab`aw2|4Dk?|y5j7wK%=w$1vCwa9
z-{nn$9unvU9FBr~CRA=+y}S#^rX{V}T0qM$T|crBVS+7YNDTr^F@@stem*?@E{2*?
zf0)i%*X=04@wk~jJATCUlk2O8J+6hBcQcKv#?anh0a8?+Kl-=6!_2Och-F90)9%%k
zc8Fg-vj+7nmUm%PxtEB{AeZ+luuq{rgh1p~_i#D@VB)(bs|Z*FgD)OKZUgbZqJisE
z2Q)=gu*D})i_r_NdXIt1lF~-4beMo%W(_k-7VnZzPx*(?b!lKw@nE`9`W~R&%YS2{
zoPc)o|HIiq=6O5{924`PW%yG`i1KvN767g3cXa=}JJB$cZWR4cm@3<E#M}vzI{Xw5
zdAkT84IThO;MOw}lJdO;*YMW{R{#*lrg%%KD0swkwk+03@4g1Q&q<v<xn(EV!fgx0
zNGu}9G@(j)J9TiT+-?;>L&?AJ@%~)J?pl!jyu|X?Y3q)Sp}y}kO!pDsCyu8Ahi%VE
z4|ZzI1|tF$KRUc$Xm{P)CHp)rc#Fv>o3dH0<zvk?k6Rf+^8RrDN&Q!?!5_`E)&F5*
zmCx(82eX3jZ0t2H%<Y~{ZXR*b);ZQx^;mAMthl=`X@%b!{)~0Lt2Vma;k}Od0Pq~y
zc2}UC0=7$bw#kHP;wL&kzFSlf5|~bZKk`J1nYh*viT(%VLZu0MpqU30+uW*;*L`}E
zA4<!z!Wx6+9wrrhjzFWi$`IcX7ek$LyE|ka_3Q`GVH;xDPDf6wI9q|_s?gR0;tik-
z$O8bn|4upmf^8Gt%l1eFm;qY}f53n@gaLSc1o-#Ywh#BIms?eJ-<EgQdgn~k^0vC%
z-QCN7z6hvstRj-?Dh!%3p#wx3HqY?r-+$ddZws&jdcdI!|1hBX+w8shbUMJ-;l{6<
z>_tZa%mY$-{FPC~RBX)W4Z$cY*zzzSe*j6_x90|kvnoSFN}!6Ny>$QuZebeL_Oq0T
z>(>1ju7*CG5!v|mO>VZljKx4K;lJD`8SF+n76SL&g;fAW=rbC3>)y_H=!vD@9xu)i
z+M|^9Jktje+3GfC3f0P)&u<MsoJzKe;Tpf_V_BY;XpvD!2ihZ`{^0s3Is4caecBW9
za*rI&KKBZOrVA$h!#E{uk$TjpkYvikNlt{N8u`<|NMGo`nx(pAqs`)$I37TEo9R64
zouXo$*A5+pL6<n;zqUedIic#n-!eNAsE;zy;!A>HU5B3nmT%T@ea=qt=nLY1=<KaO
z>L{G~qX8hz9pa}5h}OiJOGlvUd_<JT0j6iPt=9vRotZQmQ1-QM5E9uAS5i_uKv~_V
zj>mGJ9lDnzCrJA9k_rg~S(jd8b92+1M({BzfyMG5Y))(emht<0Tuh~c&v4u=`hWwF
zx4_~5p8ntO-&CgveSj+9bo&!^g{c7%)s?;jWVv<-`8mH1j#RibJ7M14PGY&#;KPh6
zQy+?dWRZ9!womba=v;Q?O*(=peEDuCfgD+|QKrT}*DsSrpuz><d_02|xCM8E;fdi2
ze5-LW>JbxJK?hPG#2x?1`=_sZ;nR=g_nQTCV`5D9QVN~I6+ulViIUi}B`qyMc=T8n
z*r5zkxI1_jGn~}7$&IO_``!P(1_wj8au%WfJ%DtjF#K)Ay^*=gtqAkhH~+H7a*2#t
zBM>t?Q_~;J<S?~C_3wvz-!auEvLfjRTa$Tb#QPGcgK_Wef0a0lGqENS(z^XjcPzVi
z#3!--leF5u8)PFkrCsul@(OlWCL;zTYYzdZf2fjf@n*qQ$T>a_wIbJ}Da1IF`#;!j
zr(KaYSD;AlDT;@@gU2EVha-42(=lS<Oh!a~y3ZSpx3sV&AzwCX=IeY=4Cbo9$d9fU
zYr-TLiv1dRpcOT~t@JVk*bTx<n^RRGeBZheH)tr#Hx_RsaIWc!%O$M0rBE~cA4Fhn
z5m+k(AK0XbnFn7ExnU{1;VD{3G(LZFyXa4#oxw__S=Yvuo3@kSJN4Ehi&@ivoh6U1
bwm@NjdWf?%DS$sBfk01HpQ}_WS-t*$pp(*e

literal 0
HcmV?d00001


From 1e36ca504a62dda2838b46e5d0492fd44b5d1067 Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Thu, 22 Jan 2015 20:41:42 +0800
Subject: [PATCH 134/142] =?UTF-8?q?=E5=A4=9A=E7=A7=8D=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=86=85=E5=AE=B9=E6=A0=B7=E5=BC=8F=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/mailer.html.erb    | 28 +++++++++-------
 app/views/mailer/_issue.html.erb     | 48 ++++++++++++++++------------
 app/views/mailer/_issue.text.erb     |  4 +++
 app/views/mailer/issue_add.html.erb  |  4 +--
 app/views/mailer/issue_edit.html.erb | 14 ++------
 app/views/mailer/issue_edit.text.erb |  8 -----
 6 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb
index a05eacbd1..abb896b61 100644
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -10,37 +10,43 @@ body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; back
 div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,ol{ margin:0; padding:0;}
 div,img,tr,td,table{ border:0;}
 table,tr,td{border:0;cellspacing:0; cellpadding:0;}
+.mail{ width:600px; margin:20px; height:auto; color:#4b4b4b; font-size:14px; }
 ol,ul,li{ list-style-type:none}
 .cl{ clear:both; overflow:hidden; margin-top: 30px;}
-a{ text-decoration:none; }
-a:hover{ text-decoration:underline; }
 .mail_box,ul,li{ list-style-type:none}
-.mail{ width:600px; margin:20px; height:auto; color:#4b4b4b; font-size:14px; }
 .mail a{color:#1b55a7; font-weight: bold; }
 .mail_content{ margin-top:30px;}
 .c_blue{ color:#1b55a7;}
 .mail_box{ border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;}
 .mail_box_p{  float:left; display: block; width:527px;}
-a.mail_reply{ display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px;}
-a:hover.mail_reply{ background:#06a9bc; text-decoration:none;}
 .mail_fujian{ float:left; width:527px; display: block; }
 .mail_fujian a{ font-weight:normal; font-size:12px;}
 .mail_foot a{ font-size:12px; font-weight:normal;}
 
+a{ text-decoration:none; }
+a:hover{ text-decoration:underline; }
+a.mail_reply{ display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px;}
+a:hover.mail_reply{ background:#06a9bc; text-decoration:none;}
+
+
+
+
+
 
 
 </style>
 </head>
-<body>
- <div class="container">
-	<div class="mail">
-    	<div class="mail_head">
+
+<body style="font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal; margin:0; padding:0; border:0;">
+ <div class="container" style="margin:0; padding:0; border:0;">
+	<div class="mail" style="width:600px; margin:20px; height:auto; color:#4b4b4b; font-size:14px; margin:0; padding:0; border:0;">
+    	<div class="mail_head" style="margin:0; padding:0; border:0;">
         	<p><%= l(:mail_issue_greetings)%></p>
         </div><!--mail_head end-->
         <%= yield %>
         <hr />
-      <span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %></span><!--mail_foot end-->
+      <span class="footer" style="margin:0; padding:0;"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %></span><!--mail_foot end-->
     </div>
-  </div>
+ </div>
 </body>
 </html>
diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb
index c97c82426..d11248aff 100644
--- a/app/views/mailer/_issue.html.erb
+++ b/app/views/mailer/_issue.html.erb
@@ -1,32 +1,40 @@
 <!-- <h1><%#= link_to(h("#{issue.tracker.name} ##{issue.project_index}: #{issue.subject}"), issue_url) %></h1> -->
 <p>
-      <span class="c_blue">
-        <%= link_to(h("#{@issue.author}(#{@issue.author.show_name})"), @issue_author_url) %>
+      <span class="c_blue" style="color:#1b55a7;">
+        <%= link_to(h("#{@issue.author}(#{@issue.author.show_name})"), @issue_author_url , :style=>'color:#1b55a7; font-weight:bold;') %>
      </span><%= l(:mail_issue_title_userin)%>
-  <span class="c_blue"><%= link_to(h("#{@issue.project.name}"),@project_url) %></span></span><%= l(:mail_issue_title_active)%></p>
-<div class="mail_box">
-<ul>
-	<li style="list-style-type:none"><span style="float: left"><strong><%= l(:mail_issue_subject)%></strong></span><span style="float: left; width: 500px"><%= link_to(issue.subject, issue_url) %></span></li>
-	<li style="list-style-type:none"><span style="float: left"> <strong><%= l(:mail_issue_sent_from)%></strong></span><span style="float: left; width: 500px"><%= issue.project.name %><b>|&nbsp;</b><%= l(:mail_issue_from_project)%></span></li>
-	<li style="list-style-type:none"><span style="float: left"> <strong ><%= l(:mail_issue_content)%></strong></span><span style="float: left; width: 500px">
-                    	<%= issue.description %></span>
+  <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: 500px"><%= 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: 500px"><%= 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: 500px">
+        	<% if @journal.nil? %>
+                 <%= issue.description %>
+            <% else %>
+            	<%= @journal.notes %>
+           <% end%>
+        </span>
     </li>
-  <li style="list-style-type:none">
+    <li style="list-style-type:none; margin:0; padding:0;">
 
-    <% unless @issue.attachments.nil? %>
-     <span style="float: left"> <strong><%= l(:mail_issue_attachments)%></strong>
-            </span><span style="float: left; width: 500px">
+      <% unless @issue.attachments.nil? %>
+        <span style="float: left; margin:0; padding:0;"> <strong><%= l(:mail_issue_attachments)%></strong></span>
+        <span style="float: left; width: 500px; margin:0; padding:0;">
           <% @issue.attachments.each do |attach| %>
-          <p><%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false) %></p>
-      <% end %></span>
-    <% end %>
+          <p style="float: left; width: 500px; margin:0; padding:0;"><%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false, :style=>'color:#1b55a7; font-weight:bold;')%></p>
+        <% end %></span>
+      <% end %>
 
 
-  </li>
+    </li>
 </ul>
-  <div class="cl"></div>
-  <label  class="mail_reply"><%= link_to( l(:mail_issue_reply), issue_url,  :class => "mail_reply") %></label>
-  <div class="cl"></div>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+  <label  class="mail_reply">
+  	<%= link_to( l(:mail_issue_reply), issue_url,  :class => "mail_reply", :style =>'display:block; float:right; width:80px; text-align:center; height:30px; background:#15bccf; color:#fff; font-weight:normal; font-size:14px; line-height: 30px;') %>
+  	</label>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
 </div>
 <!-- <li><%#=l(:field_author)%>: <%#=h issue.author %></li>
 
diff --git a/app/views/mailer/_issue.text.erb b/app/views/mailer/_issue.text.erb
index 89ee8337e..8848e494a 100644
--- a/app/views/mailer/_issue.text.erb
+++ b/app/views/mailer/_issue.text.erb
@@ -5,7 +5,11 @@
 <%= 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)%>
 
diff --git a/app/views/mailer/issue_add.html.erb b/app/views/mailer/issue_add.html.erb
index e46a93381..0b60097a7 100644
--- a/app/views/mailer/issue_add.html.erb
+++ b/app/views/mailer/issue_add.html.erb
@@ -1,9 +1,9 @@
-<div class="mail_content">
+<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"><%= link_to( l(:mail_issue_footer), @user_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>
 
diff --git a/app/views/mailer/issue_edit.html.erb b/app/views/mailer/issue_edit.html.erb
index 6fcb0ddb5..f7412402c 100644
--- a/app/views/mailer/issue_edit.html.erb
+++ b/app/views/mailer/issue_edit.html.erb
@@ -1,19 +1,11 @@
 <div>
   <%= l(:text_issue_updated, :id => "##{@issue.project_index}", :author => h(@journal.user)) %>
 
-  <ul>
-    <% details_to_strings(@journal.details, false, :only_path => false, :token => @token.value).each do |string| %>
-      <% if (!string.include? l(:label_attachment)) && (!string.include? "attachments")  %>
-        <li><%= string %></li>
-      <% end %>
-    <% end %>
-  </ul>
-
-  <span style="float: left"><strong><%= l(:field_content)%>：</strong></span><span style="float: left; width: 540px"><%= @journal.notes %></span>
+  
 </div>
-<div class="cl"></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)  %> </div>
+<div class="mail_foot"><%= link_to( l(:mail_issue_footer), @user_url, :style=>'font-size:12px; font-weight:normal; color:#1b55a7;')  %> </div>
 
diff --git a/app/views/mailer/issue_edit.text.erb b/app/views/mailer/issue_edit.text.erb
index aad21ad90..1434a7a33 100644
--- a/app/views/mailer/issue_edit.text.erb
+++ b/app/views/mailer/issue_edit.text.erb
@@ -1,15 +1,7 @@
 <%= l(:text_issue_updated, :id => "##{@issue.project_index}", :author => @journal.user) %>
 
-<% details_to_strings(@journal.details, true, :token => @token.value).each do |string| -%>
-    <% if (!string.include? l(:label_attachment)) && (!string.include? "attachments")  %>
-        <li><%= string %></li>
-    <% end %>
-<% end -%>
 
-<% if @journal.notes? -%>
-    <%= l(:field_content)%>：<%= @journal.notes %>
 
-<% end -%>
 --------------------------------------------------------------------------------
 <%= render :partial => 'issue', :formats => [:text], :locals => { :issue => @issue, :issue_url => @issue_url } %>
 

From e950208e386aabea37381d76996cb8b2ec7093aa Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Thu, 22 Jan 2015 22:05:56 +0800
Subject: [PATCH 135/142] =?UTF-8?q?=20sina=E9=82=AE=E7=AE=B1IE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/mailer/_issue.html.erb              | 12 ++++++------
 app/views/mailer/issue_edit.html.erb.BASE.erb | 19 -------------------
 .../mailer/issue_edit.html.erb.LOCAL.erb      | 11 -----------
 .../mailer/issue_edit.html.erb.REMOTE.erb     | 19 -------------------
 4 files changed, 6 insertions(+), 55 deletions(-)
 delete mode 100644 app/views/mailer/issue_edit.html.erb.BASE.erb
 delete mode 100644 app/views/mailer/issue_edit.html.erb.LOCAL.erb
 delete mode 100644 app/views/mailer/issue_edit.html.erb.REMOTE.erb

diff --git a/app/views/mailer/_issue.html.erb b/app/views/mailer/_issue.html.erb
index d11248aff..cd5fbc091 100644
--- a/app/views/mailer/_issue.html.erb
+++ b/app/views/mailer/_issue.html.erb
@@ -6,10 +6,10 @@
   <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: 500px"><%= 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: 500px"><%= 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_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: 500px">
+		<span style="float: left; width: 526px">
         	<% if @journal.nil? %>
                  <%= issue.description %>
             <% else %>
@@ -20,10 +20,10 @@
     <li style="list-style-type:none; margin:0; padding:0;">
 
       <% unless @issue.attachments.nil? %>
-        <span style="float: left; margin:0; padding:0;"> <strong><%= l(:mail_issue_attachments)%></strong></span>
-        <span style="float: left; width: 500px; margin:0; padding:0;">
+        <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: 500px; margin:0; padding:0;"><%= link_to_attachment(attach, :download => true, :token => @token.value, :only_path => false, :style=>'color:#1b55a7; font-weight:bold;')%></p>
+          <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 %>
 
diff --git a/app/views/mailer/issue_edit.html.erb.BASE.erb b/app/views/mailer/issue_edit.html.erb.BASE.erb
deleted file mode 100644
index 6fcb0ddb5..000000000
--- a/app/views/mailer/issue_edit.html.erb.BASE.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<div>
-  <%= l(:text_issue_updated, :id => "##{@issue.project_index}", :author => h(@journal.user)) %>
-
-  <ul>
-    <% details_to_strings(@journal.details, false, :only_path => false, :token => @token.value).each do |string| %>
-      <% if (!string.include? l(:label_attachment)) && (!string.include? "attachments")  %>
-        <li><%= string %></li>
-      <% end %>
-    <% end %>
-  </ul>
-
-  <span style="float: left"><strong><%= l(:field_content)%>：</strong></span><span style="float: left; width: 540px"><%= @journal.notes %></span>
-</div>
-<div class="cl"></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)  %> </div>
-
diff --git a/app/views/mailer/issue_edit.html.erb.LOCAL.erb b/app/views/mailer/issue_edit.html.erb.LOCAL.erb
deleted file mode 100644
index f7412402c..000000000
--- a/app/views/mailer/issue_edit.html.erb.LOCAL.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<div>
-  <%= l(:text_issue_updated, :id => "##{@issue.project_index}", :author => h(@journal.user)) %>
-
-  
-</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>
-
diff --git a/app/views/mailer/issue_edit.html.erb.REMOTE.erb b/app/views/mailer/issue_edit.html.erb.REMOTE.erb
deleted file mode 100644
index af167cff5..000000000
--- a/app/views/mailer/issue_edit.html.erb.REMOTE.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-<div>
-  <%= l(:text_issue_updated, :id => "##{@issue.project_index}", :author => h(@journal.user)) %>
-
-  <ul>
-    <% details_to_strings(@journal.details, false, :only_path => false, :token => @token.value).each do |string| %>
-      <% if (!string.include? l(:label_attachment)) && (!string.include? "attachments")  %>
-        <li><%= string %></li>
-      <% end %>
-    <% end %>
-  </ul>
-
-  <span style="float: left"><strong><%= l(:field_content)%>：</strong></span><span style="float: left; width: 540px"><%= @journal.notes %></span>
-</div>
-<div class="cl"></div>
-
-
-<%= render :partial => 'issue', :formats => [:html], :locals => { :issue => @issue, :issue_url => @issue_url } %>
-<div class="mail_foot"><%= link_to( l(:mail_issue_footer), @user_url)  %> </div>
-

From 2b5928602ed38a163c6d91e669cd083e52972124 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 23 Jan 2015 09:17:27 +0800
Subject: [PATCH 136/142] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E7=94=B1=E4=BA=8E?=
 =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=82=AC=E6=B5=AE=E6=A1=86=E5=BC=95=E8=B5=B7?=
 =?UTF-8?q?=E7=9A=84=E7=95=8C=E9=9D=A2=E7=9A=84padding=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98=202.=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=97=AE=E5=8D=B7=E8=B0=83=E6=9F=A5=E5=B7=A6=E4=BE=A7=E4=BC=9A?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E6=BB=9A=E5=8A=A8=E6=9D=A1=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/_bid_homework_show.html.erb |  11 ++-
 app/views/layouts/_base_feedback.html.erb  | 102 ++++++++++-----------
 app/views/poll/_poll_form.html.erb         |   2 +-
 public/stylesheets/polls.css               |   6 +-
 4 files changed, 61 insertions(+), 60 deletions(-)

diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb
index 2d6c35555..49325c0d4 100644
--- a/app/views/bids/_bid_homework_show.html.erb
+++ b/app/views/bids/_bid_homework_show.html.erb
@@ -56,18 +56,21 @@
                   <%= link_to(bid.name, course_for_bid_path(bid), :class => 'bid_path') %>
                 </span>
               </td>
-              <td style="width: 110px;">
+              <td style="width: 120px;">
                 <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">
+                           <a>匿评中..</a>
+                     </span>
                       <% if cur_user_homework && cur_user_homework.empty? %>
                          <span class="span_wping">
                            <%= link_to l(:label_commit_homework),new_exercise_book_path(bid)  %>
                          </span>
                       <% else %>
-                          <span style="color: green; float: right">
-                            <%= l(:lable_has_commit_homework)%>
-                          </span>
+                          <span class="span_wping">
+                           <a>已&nbsp;提&nbsp;交</a>
+                         </span>
                       <% end %>
                   <% end %>
                   <% if (User.current.admin?||User.current.allowed_to?(:as_teacher,@course)) %>
diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb
index ae85d9479..23a610c14 100644
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@@ -1,10 +1,10 @@
 <style type="text/css">
-	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{ }
-div,img,tr,td,table{ border:0;}
-ol,ul,li{ list-style-type:none}
-.cl{ clear:both; overflow:hidden; }
-a{ text-decoration:none;}
+	#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;}
@@ -42,19 +42,19 @@ a:hover.opnionButton{ text-decoration:underline;}
 	/* =================================================
 //
 // jQuery Fixed Plugins 1.3.1
-// author : 
-// Url: 
+// author :
+// Url:
 // Data : 2012-03-30
 //
-// ���� : float --> ����[left or right]
-//		  minStatue --> ��С״̬��ֻ��show_btn
-//		  skin      --> Ƥ������
-//		  durationTime --> ���ʱ��
-//����  :	
+// ???? : 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 
+		  	float : 'right',	//default.left or right
+			minStatue : true,	//default.false or true
+			skin : 'green',		//default.gray or yellow ??blue ??green ??orange ??white
 		  	durationTime : 1000 //
 		  });
 //
@@ -66,53 +66,53 @@ a:hover.opnionButton{ text-decoration:underline;}
             float : 'left',
 			minStatue : false,
 			skin : 'blue',
-			durationTime : 1000	
+			durationTime : 1000
         }
-        var options = $.extend(defaults, options);		
+        var options = $.extend(defaults, options);
 
-        this.each(function(){			
-            //��ȡ����
+        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);			
+				;
+			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�¼�			
+
+
+			//????scroll???
 			$(window).bind("scroll",function(){
 				var offsetTop = defaultTop + $(window).scrollTop() + "px";
 	            thisBox.animate({
 	                top: offsetTop
 	            },
 	            {
-	                duration: options.durationTime,	
-	                queue: false    //�˶����������붯������
+	                duration: options.durationTime,
+	                queue: false    //???????????????????
 	            });
-			});	
-			//close�¼�
+			});
+			//close???
 			closeBtn.bind("click",function(){
 				sideContent.animate({width: '0px'},"fast");
             	show_btn.stop(true, true).delay(300).animate({ width: '25px'},"fast");
 			});
-			//show�¼�
+			//show???
 			 show_btn.click(function() {
 	            $(this).animate({width: '0px'},"fast");
 	            sideContent.stop(true, true).delay(200).animate({ width: '154px'},"fast");
 	        });
-				
+
         });	//end this.each
 
     };
@@ -132,36 +132,34 @@ function f_submit()
 }
 </script>
 
-<!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=gb2312" />
 <title>意见反馈</title>
-<link href="css/sidebar.css" rel="stylesheet" type="text/css" />
-<script type="text/javascript" src="js/jquery-1.8.0.min.js"></script>
-<script type="text/javascript" src="js/sidebar.js"></script>
+
 </head>
 <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">                  
+            <div class="side_center">
+                <div class="custom_service">
                   <% get_memo %>
 				  <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
-         		    <%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%>        
+         		    <%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%>
           			<%= f.hidden_field :content, :required => true ,:value=>'该贴来自用户反馈！'%>
 		  			 <%#= 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>          			
-				  <% end %>   			   			                
-                </div>                               
+          			<a href="javascript:void(0);" class="opnionButton" id="" onclick="f_submit();">提&nbsp;&nbsp;交</a>
+				  <% end %>
+                </div>
                 <div class="msgserver">
-                    <p>                    	                                    	
+                    <p>
                    	<a href="http://user.trustie.net/users/12/user_newfeedback"><%= l(:label_technical_support) %>黄井泉</a></br>
                     <a href="http://user.trustie.net/users/34/user_newfeedback"><%= l(:label_technical_support) %>白&nbsp;&nbsp;&nbsp;羽</a>
-                    </p>                    
+                    </p>
                 </div>
             </div>
             <div class="side_bottom"></div>
@@ -169,9 +167,9 @@ function f_submit()
     </div>
     <div class="show_btn"><span>提交</span></div>
 </div>
-<!-- ´úÂë ½áÊø -->
-<script type="text/javascript"> 
-$(function() { 
+<!-- ?ú?? ?á?? -->
+<script type="text/javascript">
+$(function() {
 	$("#scrollsidebar").fix({
 		float : 'right',	//default.left or right
 		//minStatue : true,
@@ -179,7 +177,7 @@ $(function() {
 		durationTime : 600
 	});
 });
-</script> 
+</script>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index b3fae8b4a..df4859613 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -59,7 +59,7 @@
       {
           $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll,:is_remote => false}) %>');
           showModal('ajax-modal', '310px');
-          $('#ajax-modal').css('height','110px');
+          $('#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>");
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index e601d231d..863ee5864 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -14,9 +14,9 @@ div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margi
 #polls .fr{ float:right;}
 
 /*问卷按钮*/
-.polls_btn{ height:33px;border-top:1px solid #15bed1; border-bottom:1px solid #15bed1;border-right:1px solid #cee6e6; width:225px; 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{ height:33px;border-top:1px solid #15bed1; border-bottom:1px solid #15bed1;border-right:1px solid #cee6e6; width:225px; 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_content{ width:615px;padding-left: 6px;}

From 81f5a5e624b547eb301382ae2204e98a8fdb256f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 23 Jan 2015 09:28:01 +0800
Subject: [PATCH 137/142] =?UTF-8?q?#1854=E5=AD=A6=E7=94=9F=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E6=9F=A5=E7=9C=8B=E5=B7=B2=E6=8F=90=E4=BA=A4=E8=BF=87?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E5=8D=B7=E6=97=B6=EF=BC=8C=E5=A4=9A=E8=A1=8C?=
 =?UTF-8?q?=E4=B8=BB=E8=A7=82=E9=A2=98=E4=B8=AD=E6=98=BE=E7=A4=BA=E6=9C=89?=
 =?UTF-8?q?html=E5=85=83=E7=B4=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_show_mulit_result.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/poll/_show_mulit_result.html.erb b/app/views/poll/_show_mulit_result.html.erb
index e54cca505..786ed9460 100644
--- a/app/views/poll/_show_mulit_result.html.erb
+++ b/app/views/poll/_show_mulit_result.html.erb
@@ -13,7 +13,7 @@
     <div class="cl"></div>
     <div class="ur_inputs">
       <p>
-        <%= get_anwser_vote_text poll_question.id,User.current.id%>
+        <%= get_anwser_vote_text(poll_question.id,User.current.id).html_safe%>
       </p>
     </div>
   </div>

From 249b08392d548cf97c999b7f4615173a2319a17c Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 23 Jan 2015 09:31:30 +0800
Subject: [PATCH 138/142] =?UTF-8?q?#1856=20=E4=BF=AE=E6=94=B9=E9=97=AE?=
 =?UTF-8?q?=E5=8D=B7=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E9=97=AE=E5=8D=B7=E3=80=81=E5=8F=96=E6=B6=88=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E5=90=8E=E5=BC=B9=E5=87=BA=E7=95=8C=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/index.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index de30b5deb..a8aca1308 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -15,7 +15,7 @@
             "</div>" +
         "</div>");
         showModal('ajax-modal', '310px');
-        $('#ajax-modal').css('height','110px');
+        $('#ajax-modal').css('height','115px');
         $('#ajax-modal').siblings().remove();
         $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
             "<a onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
@@ -41,7 +41,7 @@
             "</div>" +
         "</div>");
         showModal('ajax-modal', '310px');
-        $('#ajax-modal').css('height','110px');
+        $('#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>");

From f74f2e3be77198c2ae6f8fc09219390db3dce8c6 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 23 Jan 2015 09:34:15 +0800
Subject: [PATCH 139/142] =?UTF-8?q?exec=E6=8C=89=E9=92=AE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/nyan.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css
index c532e7112..ac7142c71 100644
--- a/public/stylesheets/nyan.css
+++ b/public/stylesheets/nyan.css
@@ -1433,8 +1433,8 @@ ul.contest-notification-list li span{
 }
 
 .xls {
-    background: url('../images/icon_excel.gif') no-repeat scroll 1px 50% transparent;
-    padding: 2px 0px 3px 16px;
+    /*background: url('../images/icon_excel.gif') no-repeat scroll 1px 50% transparent;*/
+    /*padding: 2px 0px 3px 16px;*/
     font-family:微软雅黑 !important;
     font-size: 12px !important;
     color: #136b3b !important;

From ae31d0b8610177c32bcce657742f5f1a064ea88b Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 23 Jan 2015 09:42:08 +0800
Subject: [PATCH 140/142] =?UTF-8?q?#1851=E8=AF=BE=E7=A8=8B=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/bids/_bid_homework_show.html.erb | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb
index 49325c0d4..1009f405f 100644
--- a/app/views/bids/_bid_homework_show.html.erb
+++ b/app/views/bids/_bid_homework_show.html.erb
@@ -56,12 +56,21 @@
                   <%= link_to(bid.name, course_for_bid_path(bid), :class => 'bid_path') %>
                 </span>
               </td>
-              <td style="width: 120px;">
+              <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">
-                           <a>匿评中..</a>
+                        <% 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">

From c6deffe245aceaf9ef69b932e384756bba578f18 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 23 Jan 2015 09:47:13 +0800
Subject: [PATCH 141/142] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_feedback.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb
index ae85d9479..748029ee2 100644
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@@ -24,7 +24,7 @@ html{ overflow-x:hidden;}
 .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;  color:#fd6e2a; font-weight: bold; margin:-25px auto 0; text-align:center;}
+a.opnionButton{ display:block; font-weight: bold; margin:-25px auto 0; text-align:center;}
 a:hover.opnionButton{ text-decoration:underline;}
 
 
@@ -154,13 +154,13 @@ function f_submit()
          		    <%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%>        
           			<%= f.hidden_field :content, :required => true ,:value=>'该贴来自用户反馈！'%>
 		  			 <%#= 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>                               
                 <div class="msgserver">
                     <p>                    	                                    	
-                   	<a href="http://user.trustie.net/users/12/user_newfeedback"><%= l(:label_technical_support) %>黄井泉</a></br>
-                    <a href="http://user.trustie.net/users/34/user_newfeedback"><%= l(:label_technical_support) %>白&nbsp;&nbsp;&nbsp;羽</a>
+                   	<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>

From 3911450787ea8d6115f75d1dc277a0d835a9c855 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Fri, 23 Jan 2015 09:51:36 +0800
Subject: [PATCH 142/142] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E8=B0=83=E6=9F=A5?=
 =?UTF-8?q?=E7=AE=80=E7=AD=94=E9=A2=98=E8=BE=93=E5=85=A5=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E8=BF=87=E5=A4=9A=E6=98=BE=E7=A4=BA=E8=B6=85=E8=BE=B9=E6=A1=86?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/schema.rb                 | 12 ++++++++++++
 public/stylesheets/polls.css |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/db/schema.rb b/db/schema.rb
index 7d10abc35..d0d755bd3 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -23,6 +23,18 @@ ActiveRecord::Schema.define(:version => 20150121030451) do
   add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
   add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
 
+  create_table "api_keys", :force => true do |t|
+    t.string   "access_token"
+    t.datetime "expires_at"
+    t.integer  "user_id"
+    t.boolean  "active",       :default => true
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+  end
+
+  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
+  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
+
   create_table "applied_projects", :force => true do |t|
     t.integer "project_id", :null => false
     t.integer "user_id",    :null => false
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index e601d231d..3870db84c 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -53,7 +53,7 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
 .ur_inputs label{ padding-left:10px;word-break: break-all; word-wrap: break-word;}
 .ur_inputs input{ margin-right:5px;}
 .ur_text{ height:30px;}
-.ur_textbox{ border:1px solid #dcdcdc !important; color:#676765;}
+.ur_textbox{ border:1px solid #dcdcdc !important; color:#676765; word-break:break-all; word-wrap:break-word;}
 .ur_buttons{ width:250px; margin:20px auto 10px;}
 a.ur_button{ display:block; width:106px; height:37px; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:3px;  float:left; margin-right:15px;}
 a:hover.ur_button{ background:#0fa9bb; text-decoration:none;}