From 0496c33378e19927ffceadb89a49cea55a462d24 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 24 Mar 2015 09:28:35 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E7=9A=84=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/bids_controller.rb | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index 5ee3d4823..49fa45d3e 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -181,6 +181,7 @@ class BidsController < ApplicationController
     end
   end
 
+  #将某个企业外包需求选为作业，目前此功能已放弃
   def create_fork
     @homework = Bid.new
     @homework.name = params[:bid][:name]
@@ -215,6 +216,7 @@ class BidsController < ApplicationController
     end
   end
 
+  #有两个路由链接到此方法：/bids/:id    /calls/:id但是貌似这两个路由都不能访问。。方法作用有待确认
   def show
     @user = @bid.author
     @jours = @bid.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
@@ -250,40 +252,31 @@ class BidsController < ApplicationController
     else
       @state = 1
     end
-
     respond_to do |format|
-      # format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
-      # TO_DO
       format.js { render :partial => 'set_join', :locals => {:user => User.current, :object_id => params[:id]} }
     end
   end
 
   def unjoin_in_contest
-
     joined = JoinInContest.where('bid_id = ? and user_id = ?', @bid.id, User.current.id)
-
     joined.each do |join|
       join.delete
     end
-
     respond_to do |format|
-      # format.html { redirect_to_referer_or {render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true}}
       format.js { render :partial => 'set_join', :locals => {:user => User.current, :object_id => params[:id]} }
     end
   end
 
   def new_join
-    # added by fq
-
 
   end
 
   # added by bai 增加了参与者和竞赛设置
   def show_participator
     render :layout => 'base_contest'
-
   end
 
+  #配置竞赛
   def settings
     if  @bid.author.id == User.current.id
       if @bid.reward_type == 2
@@ -296,7 +289,7 @@ class BidsController < ApplicationController
   end
   #end
 
-  # 显示课程
+  # 显示课程作业，但是好像已经废弃
   def show_course
     bids = Bid.where('parent_id = ?', @bid.id)
     @courses = []

From 7970bd6df073d780ef42ee55e2f7c9511a4288c6 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 24 Mar 2015 09:57:55 +0800
Subject: [PATCH 2/9] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E6=88=AA=E8=87=B3=E6=97=B6=E9=97=B4=E7=9A=84js?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=202=E3=80=81=E6=88=AA=E6=AD=A2=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=88=B0=E4=BA=86=E4=B9=8B=E5=90=8E=E7=9A=84=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/homework.html.erb | 18 +++++++++++++++---
 public/javascripts/course.js        | 14 ++++++++------
 2 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/app/views/courses/homework.html.erb b/app/views/courses/homework.html.erb
index 751558237..f5fe74953 100644
--- a/app/views/courses/homework.html.erb
+++ b/app/views/courses/homework.html.erb
@@ -29,10 +29,22 @@
         <div class="cl"></div>
         <p  id="bid_description_<%= bid.id%>" class="news_description mt5">
           <%= textilizable bid, :description %>
-          <br /> <%= l(:label_create_time)%> ：  <%= format_time bid.created_on%></p>
-        <div class="news_foot" onclick="bid_show_more_des(<%= bid.id%>);"><%= l(:label_expend_information)%>
-          <span class="g-arr-down"><img src="/images/jiantou.jpg" width="12" height="6" /></span>
+        <div class="news_foot c_red" onclick="bid_show_more_des(<%= bid.id%>);" style="cursor:pointer;">
+          <%= l(:button_more)%>...
+          <span class="g-arr-down"></span>
         </div>
+        <span class="fl"><%= l(:label_end_time)%>：<%= bid.deadline%></span>
+        <% if betweentime(bid.deadline) < 0 %>
+            <span class='fr mr10 pr_join_span '>
+              <%= l(:label_commit_limit)%>
+            </span>
+        <% else %>
+            <script type="text/javascript">
+                window.setInterval(function(){show_bid_dead_line(<%= bid.deadline.year%>,<%= bid.deadline.month%>,<%= bid.deadline.day + 1%>,"bid_deadline_<%= bid.id%>");},1000)
+            </script>
+            <div id="bid_deadline_<%= bid.id%>">
+            </div>
+        <% end %>
       </div>
       <div class="cl"></div>
     </div>
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index f6bc4933c..4a9854fcd 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -35,7 +35,7 @@ $(document).ready(function () {
     $("#RSide").css("min-height",$("#LSide").height()-30);
 });
 //课程作业结束时间倒计时
-function ShowCountDown(year,month,day,divname)
+function show_bid_dead_line(year,month,day,divname)
 {
     var now = new Date();
     var endDate = new Date(year, month-1, day);
@@ -45,11 +45,13 @@ function ShowCountDown(year,month,day,divname)
     var hour=Math.floor((leftsecond-day1*24*60*60)/3600);
     var minute=Math.floor((leftsecond-day1*24*60*60-hour*3600)/60);
     var second=Math.floor(leftsecond-day1*24*60*60-hour*3600-minute*60);
-    $("#"+divname).html("<span style='color: #acaeb1;'>作业提交还剩&nbsp;:</span>&nbsp;<span style='color: red;'>"
-    +day1+"&nbsp;</span><span style='color: #acaeb1;'>天</span><span style='color: red;'>&nbsp;"
-    +hour+"&nbsp;</span><span style='color: #acaeb1;'>时</span><span style='color: red;'>&nbsp;"
-    +minute+"&nbsp;</span><span style='color: #acaeb1;'>分</span><span style='color: red;'>&nbsp;"
-    +second+"&nbsp;</span><span style='color: #acaeb1;'>秒</span>");
+    $("#"+divname).html("<form name='formnow' class='fr'>"
+    + "<input class='c_orange' type='text' style='border:0;' size='1' value='"+day1+"' > 天"
+    + "<input class='c_orange' type='text' style='border:0;' size='1' value='"+hour+"' > 小时"
+    + "<input class='c_orange' type='text' style='border:0;' size='1' value='"+minute+"' > 分"
+    + "<input class='c_orange' type='text' style='border:0;' size='1' value='"+second+"' > 秒"
+    + "</form>"
+    + "<p class='fr'>作业提交还剩：</p>");
 }
 //验证新建作业的名字
 function regex_bid_name()

From c4cd61c71b462ce40bfbab6f0b48fbb1ccf1d94f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 24 Mar 2015 10:02:38 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BD=9C=E4=B8=9A=E7=95=8C=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?layout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index 49fa45d3e..3d8761321 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -452,9 +452,7 @@ class BidsController < ApplicationController
   def show_courseEx
 
     if (User.current.logged? && (User.current.member_of_course?(@bid.courses.first) || User.current.admin?))
-      # flash[:notice] = ""
       @membership = User.current.coursememberships.all(:conditions => Course.visible_condition(User.current))
-
       @user = @bid.author
       @bidding_project = @bid.biding_projects.all
 
@@ -526,7 +524,7 @@ class BidsController < ApplicationController
         if @bid.reward_type == 3
           format.html {
             html_title(l(:label_homework_info))
-            render :layout => 'base_homework'
+            render :layout => 'base_courses'
           }
         elsif @bid.reward_type == 1
           format.html {
@@ -1063,6 +1061,7 @@ class BidsController < ApplicationController
     if params[:id]
       @bid = Bid.find(params[:id], :include => [{:homeworks => :user}])
       @user = @bid.author
+      @course = @bid.courses.first
     end
   rescue
     render_404

From f5059147d233986a71cbabad3ead6bbd5accc56e Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 24 Mar 2015 14:11:27 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BD=9C=E4=B8=9A=E7=95=8C=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?layout?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/controllers/bids_controller.rb b/app/controllers/bids_controller.rb
index 3d8761321..9dd64bd7a 100644
--- a/app/controllers/bids_controller.rb
+++ b/app/controllers/bids_controller.rb
@@ -524,7 +524,7 @@ class BidsController < ApplicationController
         if @bid.reward_type == 3
           format.html {
             html_title(l(:label_homework_info))
-            render :layout => 'base_courses'
+            render :layout => 'base_homework'
           }
         elsif @bid.reward_type == 1
           format.html {
@@ -1061,7 +1061,6 @@ class BidsController < ApplicationController
     if params[:id]
       @bid = Bid.find(params[:id], :include => [{:homeworks => :user}])
       @user = @bid.author
-      @course = @bid.courses.first
     end
   rescue
     render_404

From 1bba235ca0e80c5394c6fef6b2b912b5f07b6efd Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 24 Mar 2015 15:46:23 +0800
Subject: [PATCH 5/9] =?UTF-8?q?1=E3=80=81=E6=9B=B4=E6=96=B0poll.css?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=202=E3=80=81=E4=BF=AE=E6=94=B9poll=E7=9A=84i?=
 =?UTF-8?q?ndex=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll.html.erb      | 132 ++++++++++------------------
 app/views/poll/_poll_list.html.erb |   2 +-
 app/views/poll/index.html.erb      |   2 +-
 public/stylesheets/polls.css       | 133 ++++++++++++++---------------
 4 files changed, 110 insertions(+), 159 deletions(-)

diff --git a/app/views/poll/_poll.html.erb b/app/views/poll/_poll.html.erb
index 33bff6258..4f307279b 100644
--- a/app/views/poll/_poll.html.erb
+++ b/app/views/poll/_poll.html.erb
@@ -1,91 +1,51 @@
 <% has_commit = has_commit_poll?(poll.id ,User.current)%>
 <% poll_name = poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%>
-<li title="<%= poll.polls_name %>">
-  <% if @is_teacher %>
-      <% if has_commit %>
-          <sapn class="polls_title fl">
-            <%= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl", :style => "max-width: 550px;width: 550px;" %>
-          </sapn>
-      <% else %>
-          <%= link_to poll_name, poll_path(poll.id), :class => "polls_title polls_title_w fl" %>
-      <% end %>
-  <% else %>
-      <% if has_commit && poll.polls_status == 2 %>
-          <%= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl", :style => "max-width: 500px;width: auto;" %>
-      <% elsif !has_commit && poll.polls_status == 2 %>
-          <%= link_to poll_name, poll_path(poll.id), :class => "polls_title polls_title_w fl", :style => "max-width: 550px;width: 550px;" %>
-      <% end %>
-  <% end %>
-</li>
-<% if !@is_teacher && has_commit && poll.polls_status == 2%>
-    <li class="pollsbtn_tip fl ml5">已答</li>
-<% end %>
-
-<%if @is_teacher%>
-    <% if poll.polls_status == 1%>
-        <li class="pollsbtn fl ml10 pollsbtn_grey">统计结果</li>
-    <% elsif poll.polls_status == 2 || poll.polls_status == 3 %>
-        <li>
-          <%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fl ml10"%>
-        </li>
-    <% end%>
-<% end%>
-
-
-<%if @is_teacher %>
-    <% if poll.polls_status == 1 %>
-        <li>
-          <a href="#" class="pollsbtn btn_pu fl ml5" onclick="poll_submit(<%= poll.id%>,<%= poll.polls_name.length %>);">
-            发布问卷
-          </a>
-        </li>
-    <% elsif poll.polls_status == 2%>
-        <li>
-          <a href="#" class="pollsbtn btn_de fl ml5" onclick="republish_poll(<%= poll.id%>);">
-            取消发布
-          </a>
-        </li>
-    <% else%>
-      <li class="pollsbtn fl ml10 pollsbtn_grey" style="margin-left: 5px;" >
-        发布问卷
-      </li>
-    <% end%>
-<% end%>
-
-<li>
-  <% if @is_teacher %>
-      <!--新建状态的问卷可删除-->
-      <%= link_to(l(:button_delete), poll,
-                  method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml15 mr10")  %>
-  <% end%>
-</li>
-
 <% if @is_teacher%>
-  <% if poll.polls_status == 1 %>
-    <li>
-      <%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml15"%>
-    </li>
-  <% else%>
-    <li class="polls_de_grey fr ml15">
-      编辑
-    </li>
-  <% end%>
-<% end%>
-
-<% if @is_teacher%>
-    <% if poll.polls_status == 2 %>
-        <li>
-          <a class="polls_de fr ml15" onclick="close_poll(<%= poll.id%>);">关闭</a>
-        </li>
+  <li title="<%= poll.polls_name %>">
+    <% if has_commit %>
+        <%= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue"%>
     <% else %>
-        <li class="polls_de_grey fr ml15">
-          关闭
-        </li>
+        <%= link_to poll_name, poll_path(poll.id), :class => "polls_title polls_title_w fl c_dblue" %>
+    <% end %>
+  </li>
+
+  <% if poll.polls_status == 1%>
+      <li class="pollsbtn fl ml10 pollsbtn_grey">统计结果</li>
+  <% elsif poll.polls_status == 2 || poll.polls_status == 3 %>
+      <li><%= link_to l(:label_statistical_results), statistics_result_poll_path(poll.id), :class => "pollsbtn fl ml10"%></li>
+  <% end%>
+
+  <% if poll.polls_status == 1 %>
+      <li><a href="#" class="pollsbtn btn_pu fl ml5" onclick="poll_submit(<%= poll.id%>,<%= poll.polls_name.length %>);">发布问卷</a></li>
+  <% elsif poll.polls_status == 2%>
+      <li><a href="#" class="pollsbtn btn_de fl ml5" onclick="republish_poll(<%= poll.id%>);">取消发布</a></li>
+  <% else%>
+      <li class="pollsbtn fl ml10 pollsbtn_grey" style="margin-left: 5px;" >发布问卷</li>
+  <% end%>
+
+  <%= link_to(l(:button_delete), poll,:method => :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "polls_de fr ml5 mr10")  %>
+
+  <% if poll.polls_status == 1 %>
+      <li><%= link_to l(:button_edit), edit_poll_path(poll.id), :class => "polls_de fr ml5"%></li>
+  <% else%>
+      <li class="polls_de_grey fr ml5">编辑</li>
+  <% end%>
+
+  <% if poll.polls_status == 2 %>
+      <li><a class="polls_de fr ml5" onclick="close_poll(<%= poll.id%>);" href="">关闭</a></li>
+  <% else %>
+      <li class="polls_de_grey fr ml5">关闭</li>
+  <% end%>
+
+  <li class="polls_date fr"><%= format_date poll.created_at.to_date%></li>
+<% else%>
+    <% if poll.polls_status == 2%>
+        <% if has_commit%>
+            <li><%= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_st fl c_dblue" %></li>
+            <li class="pollsbtn_tip fl ml5">已答</li>
+        <%else%>
+            <%= link_to poll_name, poll_path(poll.id), :class => "polls_title polls_title_st fl c_dblue"%>
+        <%end%>
     <% end%>
-
-<% end %>
-
-
-<li class="polls_date fr mr10">
-  <%= format_time poll.created_at%>
-</li>
\ No newline at end of file
+    <li class="polls_date fr mr10"><%= format_date poll.created_at.to_date%></li>
+<% end%>
\ No newline at end of file
diff --git a/app/views/poll/_poll_list.html.erb b/app/views/poll/_poll_list.html.erb
index f57a4a5ff..becfc32a5 100644
--- a/app/views/poll/_poll_list.html.erb
+++ b/app/views/poll/_poll_list.html.erb
@@ -9,7 +9,7 @@
 <div class="cl"></div>
 <div class="polls_list">
   <% @polls.each do |poll|%>
-      <ul id="polls_<%= poll.id %>">
+      <ul id="polls_<%= poll.id %>" class="polls_list_ul">
         <%= render :partial => 'poll', :locals => {:poll => poll} %>
       </ul>
       <div class="cl"></div>
diff --git a/app/views/poll/index.html.erb b/app/views/poll/index.html.erb
index 0b780aa9e..cea582360 100644
--- a/app/views/poll/index.html.erb
+++ b/app/views/poll/index.html.erb
@@ -81,6 +81,6 @@
         $('#ajax-modal').parent().addClass("popbox_polls");
     }
 </script>
-<div class="polls_content" id="polls" style="width:677px;">
+<div class="polls_content02" id="polls">
   <%= render :partial => 'poll_list'%>
 </div><!--问卷内容end-->
\ No newline at end of file
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index a0d64645a..ba5028a97 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -1,74 +1,59 @@
-/* CSS Document */
-#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;}
-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_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;}
-.polls_head{ width:677px; height:48px; background:#eaeaea;}
+.polls_content{ width:609px;}
+.polls_content02{ width:670px;}
+.polls_head{ width:670px; 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.newbtn{ float:right; display:block; width:80px; height:27px; padding-top:3px; 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: 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;}
+.polls_list_ul{ padding-left:10px; border-bottom:1px dashed #c9c9c9; height:32px; padding-top:8px;}
+a.polls_title{ font-weight:bold; color:#3e6d8e; margin-top:3px;}
+a.pollsbtn{ display:block; width:66px; height:20px; padding-top:2px; 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;padding-left: 5px;}
+.polls_date{  color:#666666;margin-top:3px; }
+.polls_de{ color:#6883b6; margin-top:3px;}
 /****翻页***/
-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: 1px 5px 0px 5px; margin-left:3px;margin-top: -2px; border:1px solid #64bdd9;}
-
+.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;margin-left: 7px;}
-.ur_page_title{ font-size:16px;  text-align:center; color:#353535; word-break:break-all; word-wrap:break-word;}
+.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 ; float:left; width:604px; word-break: break-all; word-wrap: break-word;}
+.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:617px;word-break: break-all; word-wrap: break-word;}
-.ur_inputs label{ padding-left:10px;word-break: break-all; word-wrap: break-word;}
+.ur_table{border-top:1px solid #dcdcdc; background:#fff;}
+.ur_inputs tr td{ height:40px;border-bottom:1px solid #dcdcdc; width:617px;}
+.ur_inputs tr td.noline{ border-bottom:none;}
+.ur_inputs label{ padding-left:10px;}
 .ur_inputs input{ margin-right:5px;}
 .ur_text{ height:30px;}
-.ur_textbox{ border:1px solid #dcdcdc !important; color:#676765; word-break:break-all; word-wrap:break-word;}
+.ur_textbox{ border:1px solid #dcdcdc; color:#676765; background:#fff;}
 .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.ur_button{ display:block; width:106px; height:31px; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:4px;  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; word-break:break-all; word-wrap:break-word;}
+.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:601px; padding-left:5px; word-break:break-all; word-wrap:break-word; }
+.table_bluebg{ background:#e9f1f6; color:#2f3a40; height:24px;}
+.td327{ width:300px; padding-left:5px;}
 .td42{ width:42px; text-align:center;}
-.td287{ width:259px;padding-left:5px; text-align:center; }
-.td111{ width:601px;padding-left:5px; word-break:break-all; word-wrap:break-word; }
+.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;}
@@ -76,7 +61,7 @@ a:hover.ur_button{ background:#0fa9bb; text-decoration:none;}
 /*问卷编辑*/
 .polls_edit{ color:#767676;}
 a:hover{ text-decoration:none; cursor:pointer;}
-.tabs_1{ width:665px; height: auto; border:1px solid #cbcbcb; padding:10px 0 0 10px; margin-bottom:10px;}
+.tabs{ width:658px; 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;}
@@ -84,37 +69,37 @@ a:hover.icon_delete{ font-weight: bold;}
 .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{ float:left; width:139px; 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;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;}
+.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 -121px no-repeat; }
 
-.ur_editor {width:655px; border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px;}
+.ur_editor {width:648px; 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;border: 1px solid #DCDCDC !important;}
-.textarea_editor{  width:632px; height:120px; padding:10px; margin-bottom:10px;border: 1px solid #DCDCDC !important;}
+.input_title{ width:627px; height:40px; padding:0 10px; text-align:center; font-size:16px; font-weight:bold; background:#fff;border-style:solid; border:1px solid #CBCBCB;}
+.textarea_editor{  width:627px; height:120px; padding:10px; margin-bottom:10px; background:#fff; border-style:solid; border:1px solid #CBCBCB;}
 .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;border: 1px solid #DCDCDC !important;}
+.ur_question_title{ width:534px; height:30px; border:1px solid #cbcbcb; padding-left:5px; margin-right:10px; background:#fff;}
 .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:0 5px; float:left; margin-right:10px; }
+.ur_item input{ width:324px; height:30px;border:1px solid #cbcbcb; padding-left:5px; float:left; margin-right:10px; background:#fff;}
 .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;  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; }
+.ur_editor_toolbar input{ width:40px; height:20px; background:#fff;}
+.ur_editor02{width:648px; border:1px solid #cbcbcb; padding:10px; margin-bottom:10px;}
+a.ur_button_submit{ display:block; width:106px; height:31px; margin:0 auto; background:#15bccf; color:#fff; font-size:16px; text-align:center; padding-top:4px; 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;}
@@ -122,11 +107,11 @@ a:hover.ur_icon_de{ background:url(images/icons.png) -20px -338px no-repeat;}
 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;}
+#popbox_polls{width:300px;position:absolute;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/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.upload_btn{ display:block; float:left; margin:15px 0 5px; width:60px; height:30px; 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;}
@@ -136,18 +121,24 @@ 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 -372px  no-repeat;padding-left:7px; color:#fff;}
+.pollsbtn_tip{ width:30px; height:17px; padding-top:2px; 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; }
 a:hover.btn_pu{ background:#3cb761;}
-.pollsbtn_grey{ border:1px solid #b1b1b1; color:#b1b1b1; padding:0px 9px; }
+.pollsbtn_grey{ border:1px solid #b1b1b1; color:#b1b1b1; padding:0px 9px; height:19px; padding-top:3px; }
 .polls_title_w { width:330px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
-.polls_de_grey{ color:#b1b1b1;padding-left: 5px;}
+.polls_title_st { max-width:530px; overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
+.polls_de_grey{ color:#b1b1b1; margin-top:3px;}
 .ml5{ margin-left:5px;}
+.polls_btn a{ float:left;}
+.polls_n{ float:left; background:#ff5d31; color:#fff; width:32px;  padding-left:2px; height:7px; padding-bottom:7px; }
+.polls_n p{ margin-top:-4px;}
+
+/***新增20150123***/
+.ur_buttons{ width:275px; }
+.ur_button_submit{ float:left;}
+.polls_cha{float:left; margin-left:15px; margin-top:10px;}
+
+
 
-/******确定弹框***********/
-.poll_alert_form{width:140px;height:180px;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;}
-.polls_alert_btn_box{width: 100%;margin: 0 auto;padding-left: 45px;}
-.polls_alert_upload_box{ width:120px; margin:15px auto;}
-.polls_alert_box_p{ font-size:14px; padding-left: 45px;padding-top: 10px;}

From 25b37725200318b3de7b18fc61a9bc94afd96111 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 24 Mar 2015 16:14:04 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0poll=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=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/_choice_show.html.erb      | 28 ++++-----
 app/views/poll/_quiz_answers.html.erb     | 12 ++--
 app/views/poll/statistics_result.html.erb | 75 ++++++++++-------------
 public/stylesheets/polls.css              |  2 +
 4 files changed, 56 insertions(+), 61 deletions(-)

diff --git a/app/views/poll/_choice_show.html.erb b/app/views/poll/_choice_show.html.erb
index d541386d3..408b9d490 100644
--- a/app/views/poll/_choice_show.html.erb
+++ b/app/views/poll/_choice_show.html.erb
@@ -7,21 +7,21 @@
         <td class="td287"><%= l(:label_poll_proportion) %> </td>
       </tr>
       <% poll_question.poll_answers.each do |poll_answer| %>
-      <tr>
-        <td class="td327"><%= poll_answer.answer_text %> </td>
-        <td class="td42"><%= poll_answer.poll_votes.count %> </td>
-        <td class="td287">
-          <div class="Bar">
-            <span style="width:<%= statistics_result_percentage(poll_answer.poll_votes.count, total_answer(poll_question.id)) %>%;" id="choice_percentage_<%= poll_answer.id %>"></span>
-    	  </div>
-          <%= statistics_result_percentage(poll_answer.poll_votes.count, total_answer(poll_question.id)) %>%</td>
-      </tr>
+          <tr>
+            <td class="td327"><%= poll_answer.answer_text %> </td>
+            <td class="td42"><%= poll_answer.poll_votes.count %> </td>
+            <td class="td287">
+              <div class="Bar">
+                <span style="width:<%= statistics_result_percentage(poll_answer.poll_votes.count, total_answer(poll_question.id)) %>%;" id="choice_percentage_<%= poll_answer.id %>"></span>
+              </div>
+              <%= statistics_result_percentage(poll_answer.poll_votes.count, total_answer(poll_question.id)) %>%</td>
+          </tr>
       <% end %>
-        <tr class="table_bluebg">
-          <td class="td327"><%= l(:label_poll_valid_commit) %> </td>
-          <td class="td42"><%= total_answer(poll_question.id) %></td>
-          <td class="td287">&nbsp; </td>
-        </tr>
+      <tr class="table_bluebg">
+        <td class="td327"><%= l(:label_poll_valid_commit) %> </td>
+        <td class="td42"><%= total_answer(poll_question.id) %></td>
+        <td class="td287">&nbsp; </td>
+      </tr>
      </tbody>
    </table>
 </div>
diff --git a/app/views/poll/_quiz_answers.html.erb b/app/views/poll/_quiz_answers.html.erb
index 34086d25e..7a09cbad9 100644
--- a/app/views/poll/_quiz_answers.html.erb
+++ b/app/views/poll/_quiz_answers.html.erb
@@ -1,16 +1,20 @@
 <div class="ur_table_result">
-  <table  border="0" cellspacing="0" cellpadding="0" >
+  <table  border="0" cellspacing="0" cellpadding="0" class="full_width">
     <tbody>
       <tr class="table_bluebg">
-        <td class="td327" ><%= l(:label_answer) %> </td>
+        <td class="td_full"><%= l(:label_answer) %> </td>
       </tr>
       <% poll_question.poll_votes.each do |poll_vote| %>
       	<tr>     		
-          <td class="td111"><%= poll_vote.vote_text.html_safe %> </td>
+          <td class="td_full"><%= poll_vote.vote_text.html_safe %> </td>
       	</tr>     
       <% end %>
         <tr class="table_bluebg">
-          <td class="td327"><%= l(:label_poll_answer_valid_result) %> <%= l(:label_answer_total) %><%= poll_question.poll_votes.count %></td>
+          <td class="td_full">
+            <%= l(:label_poll_answer_valid_result) %>
+            <%= l(:label_answer_total) %>
+            <%= poll_question.poll_votes.count %>
+          </td>
         </tr>
      </tbody>
    </table>
diff --git a/app/views/poll/statistics_result.html.erb b/app/views/poll/statistics_result.html.erb
index fd78d9230..da89bf26e 100644
--- a/app/views/poll/statistics_result.html.erb
+++ b/app/views/poll/statistics_result.html.erb
@@ -1,46 +1,35 @@
-<!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> 
-	  <div>
-          <% @poll_questions.each do |poll_question| %>
-            <ol style="margin-left: -40px;">
-              <li class="ur_question_item">
-                <div class="ur_title_result">
+<%= stylesheet_link_tag  'polls', :media => 'all' %>
+<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>
+  <div>
+    <% @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>
-                  <% 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 %>
-          <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>
-  </body>
-</html>
+              <%= poll_question.question_title %>
+              <span class="title_index">
+                [<%= options_show(poll_question.question_type) %>]
+              </span>
+            </div>
+            <% 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 %>
+    <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>
\ No newline at end of file
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index ba5028a97..21b929bff 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -52,6 +52,8 @@ a:hover.ur_button{ background:#0fa9bb; text-decoration:none;}
 .ur_table_result tr td{ border-left:1px solid #cbcbcb;border-top:1px solid #cbcbcb; height:20px;}
 .table_bluebg{ background:#e9f1f6; color:#2f3a40; height:24px;}
 .td327{ width:300px; padding-left:5px;}
+.full_width{width:100%;}
+.td_full{ width:100%; padding-left:5px;}
 .td42{ width:42px; text-align:center;}
 .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; }

From 273e82f6207a372caa2a7fb8537e49ad8bbfebca Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 24 Mar 2015 16:26:54 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9poll=E7=9A=84show?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=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.html.erb | 139 ++++++++++++++---------------------
 public/javascripts/course.js |  10 +++
 public/stylesheets/polls.css |   4 +
 3 files changed, 69 insertions(+), 84 deletions(-)

diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index ad10a5468..ffbc8c11a 100644
--- a/app/views/poll/show.html.erb
+++ b/app/views/poll/show.html.erb
@@ -1,97 +1,69 @@
-<!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_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;}
-    .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)
-      {
-          hideModal($("#popbox"));
-      }
-  </script>
-</head>
-
-<body>
+<%= stylesheet_link_tag  'polls', :media => 'all' %>
 <div class="polls_content polls_box" id="polls">
   <div class="ur_page_head" >
     <h1 class="ur_page_title">
       <%= @poll.polls_name%>
     </h1>
-    <%= @poll.polls_description.nil? ? "" : @poll.polls_description.html_safe%>
+    <p class="ur_prefix_content">
+        <%= @poll.polls_description.nil? ? "" : @poll.polls_description.html_safe%>
+    </p>
   </div>
 
-
   <div class="ur_card">
     <ol class="ur_questions">
       <% @poll_questions.each do |pq| %>
-         <% if pq.question_type == 1 %>
-          <!-- 单选题 -->
+          <% if pq.question_type == 1 %>
+              <!-- 单选题 -->
               <li class="ur_question_item radio">
                 <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>
+                      <span class="ur_required" title="<%= l(:label_must_answer) %>">*</span>
                   <% end %>
                 </div>
                 <div class="cl"></div>
                 <div class="ur_inputs">
                   <form>
-                  <table class="ur_table" >
-                    <tbody>
+                    <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) {
-                                            var dataObj = eval(data);
-                                            obj.checked = true;
-                                            var span = $('#percent');
-                                            span.html(dataObj.percent);
-                                          }
-                                      });
-                                  }
-                              </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),:disabled => !@can_edit_poll %>
-                              <%= pa.answer_text %>
-                            </label>
-                          </td>
-                        </tr>
+                          <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) {
+                                                var dataObj = eval(data);
+                                                obj.checked = true;
+                                                var span = $('#percent');
+                                                span.html(dataObj.percent);
+                                            }
+                                        });
+                                    }
+                                </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),:disabled => !@can_edit_poll %>
+                                <%= pa.answer_text %>
+                              </label>
+                            </td>
+                          </tr>
                       <% end %>
-                    </tbody>
-                  </table>
+                      </tbody>
+                    </table>
                   </form>
                 </div>
               </li>
-         <% elsif pq.question_type == 2 %>
-          <!-- 多选题 -->
+          <% elsif pq.question_type == 2 %>
+              <!-- 多选题 -->
               <li class="ur_question_item checkbox">
                 <div class="ur_title">
                   <span class="title_index"><%= l(:label_question_number,:question_number => pq.question_number) %></span>
@@ -106,7 +78,7 @@
                   <form>
                     <table class="ur_table" >
                       <tbody>
-                        <% pq.poll_answers.each do |pa| %>
+                      <% pq.poll_answers.each do |pa| %>
                           <tr>
                             <td>
                               <label >
@@ -141,14 +113,14 @@
                               </label>
                             </td>
                           </tr>
-                        <% end %>
+                      <% end %>
                       </tbody>
                     </table>
                   </form>
                 </div>
               </li>
           <% elsif pq.question_type == 3 %>
-          <!-- 单行文字-->
+              <!-- 单行文字-->
               <li  class="ur_question_item text">
                 <div class="ur_title">
                   <span class="title_index"><%= l(:label_question_number,:question_number => pq.question_number) %></span>
@@ -185,7 +157,7 @@
                 </div>
               </li><!--单行输入 end-->
           <% elsif pq.question_type == 4 %>
-          <!-- 多行文字-->
+              <!-- 多行文字-->
               <li class="ur_question_item textarea">
                 <div class="ur_preview">
                   <div class="ur_title">
@@ -212,8 +184,8 @@
                                     var dataObj = eval(data);
                                     if(dataObj.text != 'failure')
                                     {
-                                      var span = $('#percent');
-                                      span.html(dataObj.percent);
+                                        var span = $('#percent');
+                                        span.html(dataObj.percent);
                                     }
                                     else
                                     {
@@ -229,8 +201,8 @@
                 </div>
               </li><!--多行输入 end-->
           <% else %>
-          <!-- 未知题型 -->
-         <% end %>
+              <!-- 未知题型 -->
+          <% end %>
       <% end %>
     </ol>
     <ul class="wlist">
@@ -239,16 +211,15 @@
     <div class="cl"></div>
     <div class="ur_buttons" style="width: 100px;">
       <% if @poll.polls_status == 2 %>
-        <%= link_to l(:button_submit),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"><%= l(:label_complete_question) %> <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>
-
-
-
 </div><!--问卷内容end-->
-</body>
-</html>
diff --git a/public/javascripts/course.js b/public/javascripts/course.js
index 4a9854fcd..2bd85093f 100644
--- a/public/javascripts/course.js
+++ b/public/javascripts/course.js
@@ -69,6 +69,8 @@ function regex_bid_name()
         return true;
     }
 }
+
+//验证匿评数量
 function regex_evaluation_num()
 {
     var evaluation_num = $.trim($("#bid_evaluation_num").val());
@@ -105,6 +107,7 @@ function regex_evaluation_num()
     }
 }
 
+//点击是否开启匿评单选框效果
 $(function(){
     $("#bid_open_anonymous_evaluation").click(function(){
         if($("#bid_open_anonymous_evaluation").attr("checked") == "checked")
@@ -118,10 +121,17 @@ $(function(){
     });
 });
 
+//老师提交新建作业
 function submit_new_bid(id)
 {
     if(regex_bid_name()&&regex_evaluation_num())
     {
         $("#"+id).submit();
     }
+}
+
+//隐藏提示狂
+function hidden_atert_form(cur_page,cur_type)
+{
+    hideModal($("#popbox"));
 }
\ No newline at end of file
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index 21b929bff..e07c10438 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -142,5 +142,9 @@ a:hover.btn_pu{ background:#3cb761;}
 .ur_button_submit{ float:left;}
 .polls_cha{float:left; margin-left:15px; margin-top:10px;}
 
+/*问卷提交时弹出框*/
+.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;}
+
 
 

From baab3343c8620623ba8715ff561594843af962a6 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 24 Mar 2015 16:56:39 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E7=BC=96=E8=BE=91poll=E7=95=8C=E9=9D=A2?=
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/_edit_MCQ.html.erb    |   7 +-
 app/views/poll/_edit_head.html.erb   |   2 +-
 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   | 183 +++++++++++++--------------
 app/views/poll/_show_head.html.erb   |   6 +-
 11 files changed, 110 insertions(+), 118 deletions(-)

diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index 19a1e1e89..9209bf61d 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -7,7 +7,7 @@
           $("#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>" +
+              "<label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</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>" +
@@ -29,7 +29,7 @@
         <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>
+                <label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</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>
@@ -39,7 +39,7 @@
         </ul>
       </div>
       <div class="ur_editor_footer">
-        <a class="btn btn_dark btn_submit" data-button="ok" onclick="edit_poll_question($(this),<%= poll_question.id %>);">
+        <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= poll_question.id %>);">
           <%= l(:label_button_ok)%>
         </a>
         <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">
diff --git a/app/views/poll/_edit_MCQ.html.erb b/app/views/poll/_edit_MCQ.html.erb
index 508835d7d..86e04106f 100644
--- a/app/views/poll/_edit_MCQ.html.erb
+++ b/app/views/poll/_edit_MCQ.html.erb
@@ -6,7 +6,7 @@
             $("#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>" +
+                    "<label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</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>" +
@@ -17,6 +17,7 @@
     </script>
   <div class="ur_editor checkbox">
     <div class="ur_editor_title">
+      <label>问题：&nbsp;&nbsp;</label>
       <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
       <input  maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入多选题标题" value="<%= poll_question.question_title%>"/>
       <input type="checkbox" name="is_necessary" id="is_necessary_<%=poll_question.id%>" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
@@ -26,7 +27,7 @@
       <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>
+              <label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>
               <input  maxlength="200" type='text' name='question_answer[<%= poll_answer.id %>]' placeholder='新建选项' value="<%= poll_answer.answer_text%>"/>
               <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
               <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
@@ -36,7 +37,7 @@
       </ul>
     </div>
     <div class="ur_editor_footer">
-      <a class="btn btn_dark btn_submit" data-button="ok" onclick="edit_poll_question($(this),<%= poll_question.id %>);">
+      <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= poll_question.id %>);">
         <%= l(:label_button_ok)%>
       </a>
       <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">
diff --git a/app/views/poll/_edit_head.html.erb b/app/views/poll/_edit_head.html.erb
index c74453f6d..06e162f0d 100644
--- a/app/views/poll/_edit_head.html.erb
+++ b/app/views/poll/_edit_head.html.erb
@@ -12,7 +12,7 @@
         </textarea>
       </div>
       <div class="ur_editor_footer" style="padding-top: 10px;">
-        <a class="btn_submit" data-button="ok" onclick="pollsSubmit($(this));">
+        <a class="btn_submit c_white" data-button="ok" onclick="pollsSubmit($(this));">
           <%= l(:label_button_ok)%>
         </a>
         <a class="btn_cancel" data-button="cancel" onclick="pollsCancel();">
diff --git a/app/views/poll/_edit_mulit.html.erb b/app/views/poll/_edit_mulit.html.erb
index f3f121784..390be25f2 100644
--- a/app/views/poll/_edit_mulit.html.erb
+++ b/app/views/poll/_edit_mulit.html.erb
@@ -20,7 +20,7 @@
     <!--<label>高 <input name="rows" type="number" min="1" value="5"> 行</label>-->
   </div>
   <div class="ur_editor_footer">
-    <a class="btn_submit" data-button="ok" onclick="edit_poll_question($(this),<%= poll_question.id %>);">
+    <a class="btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= poll_question.id %>);">
       <%= l(:label_button_ok)%>
     </a>
     <a class="btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">
diff --git a/app/views/poll/_edit_single.html.erb b/app/views/poll/_edit_single.html.erb
index eadf5b00d..2feeee949 100644
--- a/app/views/poll/_edit_single.html.erb
+++ b/app/views/poll/_edit_single.html.erb
@@ -16,7 +16,7 @@
     <label for="ur_question_require">必答</label>
   </div>
   <div class="ur_editor_footer">
-    <a class="btn_submit" data-button="ok" onclick="edit_poll_question($(this),<%= poll_question.id %>);">
+    <a class="btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= poll_question.id %>);">
       <%= l(:label_button_ok)%>
     </a>
     <a class="btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">
diff --git a/app/views/poll/_new_MC.html.erb b/app/views/poll/_new_MC.html.erb
index b4624bbb5..8c47baa01 100644
--- a/app/views/poll/_new_MC.html.erb
+++ b/app/views/poll/_new_MC.html.erb
@@ -11,21 +11,21 @@
       <div class="ur_editor_content">
         <ul>
           <li class='ur_item'>
-            <label>选项<span class='ur_index'></span>：</label>
+            <label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>
             <input maxlength="200" type='text' name='question_answer[0]' placeholder='新建选项'/>
             <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
             <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
           </li>
           <div class='cl'></div>
           <li class='ur_item'>
-            <label>选项<span class='ur_index'></span>：</label>
+            <label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>
             <input maxlength="200" type='text' name='question_answer[1]' placeholder='新建选项'/>
             <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
             <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
           </li>
           <div class='cl'></div>
           <li class='ur_item'>
-            <label>选项<span class='ur_index'></span>：</label>
+            <label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>
             <input maxlength="200" type='text' name='question_answer[2]' placeholder='新建选项'/>
             <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
             <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
@@ -34,7 +34,7 @@
         </ul>
       </div>
       <div class="ur_editor_footer">
-        <a class="btn btn_dark btn_submit" data-button="ok" onclick="add_poll_question($(this));">
+        <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">
           <%= l(:label_button_ok)%>
         </a>
         <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">
diff --git a/app/views/poll/_new_MCQ.html.erb b/app/views/poll/_new_MCQ.html.erb
index 9cf6170c0..43b41f95d 100644
--- a/app/views/poll/_new_MCQ.html.erb
+++ b/app/views/poll/_new_MCQ.html.erb
@@ -10,21 +10,21 @@
     <div class="ur_editor_content">
       <ul>
         <li class='ur_item'>
-          <label>选项<span class='ur_index'></span>：</label>
+          <label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>
           <input maxlength="200" type='text' name='question_answer[0]' placeholder='新建选项'/>
           <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
           <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
         </li>
         <div class='cl'></div>
         <li class='ur_item'>
-          <label>选项<span class='ur_index'></span>：</label>
+          <label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>
           <input maxlength="200" type='text' name='question_answer[1]' placeholder='新建选项'/>
           <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
           <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
         </li>
         <div class='cl'></div>
         <li class='ur_item'>
-          <label>选项<span class='ur_index'></span>：</label>
+          <label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>
           <input maxlength="200" type='text' name='question_answer[2]' placeholder='新建选项'/>
           <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
           <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
@@ -33,7 +33,7 @@
       </ul>
     </div>
     <div class="ur_editor_footer">
-      <a class="btn btn_dark btn_submit" data-button="ok" onclick="add_poll_question($(this));">
+      <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">
         <%= l(:label_button_ok)%>
       </a>
       <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">
diff --git a/app/views/poll/_new_mulit.html.erb b/app/views/poll/_new_mulit.html.erb
index 48122bad0..8a2205760 100644
--- a/app/views/poll/_new_mulit.html.erb
+++ b/app/views/poll/_new_mulit.html.erb
@@ -13,7 +13,7 @@
     <!--<label>高 <input name="rows" type="number" min="1" value="5"> 行</label>-->
   </div>
   <div class="ur_editor_footer">
-    <a class="btn_submit" data-button="ok" onclick="add_poll_question($(this));">
+    <a class="btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">
       <%= l(:label_button_ok)%>
     </a>
     <a class="btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">
diff --git a/app/views/poll/_new_single.html.erb b/app/views/poll/_new_single.html.erb
index f2137b348..7588bf3b4 100644
--- a/app/views/poll/_new_single.html.erb
+++ b/app/views/poll/_new_single.html.erb
@@ -8,7 +8,7 @@
         <label for="ur_question_require">必答</label>
       </div>
       <div class="ur_editor_footer">
-        <a class="btn_submit" data-button="ok" onclick="add_poll_question($(this));">
+        <a class="btn_submit c_white" data-button="ok" onclick="add_poll_question($(this));">
           <%= l(:label_button_ok)%>
         </a>
         <a class="btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index b73de94e0..b7a90b9a9 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -1,106 +1,97 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>问卷调查_问卷编辑</title>
-  <%= stylesheet_link_tag  'polls', :media => 'all' %>
-  <%#= javascript_include_tag "polls" %>
+<%= stylesheet_link_tag  'polls', :media => 'all' %>
 
-  <script type="text/javascript">
-    //编辑问卷描述之后
-    function edit_head(){
-        $("#polls_description").val($("#polls_description_div").html());
-    }
+<script type="text/javascript">
+//编辑问卷描述之后
+function edit_head(){
+    $("#polls_description").val($("#polls_description_div").html());
+}
 
-      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 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 add_poll_question(doc)
+  //添加标题时确定按钮
+  function add_poll_question(doc)
+  {
+      var title = $.trim($("#poll_questions_title").val());
+      if(title.length == 0){alert("标题不能为空");}else{doc.parent().parent().parent().submit();}
+  }
+  //修改标题时确定按钮
+  function edit_poll_question(doc,id)
+  {
+      var title = $.trim($("#poll_questions_title_" + id).val());
+      if(title.length == 0){alert("标题不能为空");}else{doc.parent().parent().parent().submit();}
+  }
+
+  //问卷头
+  function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
+  function pollsSubmit(doc){
+      var title = $.trim($("#polls_title").val());
+      if(title.length == 0){alert("问卷标题不能为空");}else{doc.parent().parent().parent().submit();}
+  }
+  function pollsEdit(){$("#polls_head_edit").show();$("#polls_head_show").hide();}
+  //
+  function pollQuestionCancel(question_id){
+      $("#show_poll_questions_"+question_id).show();
+      $("#edit_poll_questions_"+question_id).hide();
+  }
+  function pollQuestionEdit(question_id){
+      $("#show_poll_questions_"+question_id).hide();
+      $("#edit_poll_questions_"+question_id).show();
+      $("#poll_questions_title_"+question_id).focus();
+  }
+  //单选题
+  function add_single_answer(doc)
+  {
+      doc.parent().after("<li class='ur_item'><label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label><input maxlength='200' type='text' name='question_answer["+new Date().getTime()+"]' placeholder='新建选项'/>" +
+          "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a><a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>"+
+          "</li><div class='cl'></div>");
+  }
+  function remove_single_answer(doc)
+  {
+      if(doc.parent().siblings("li").length == 0)
       {
-          var title = $.trim($("#poll_questions_title").val());
-          if(title.length == 0){alert("标题不能为空");}else{doc.parent().parent().parent().submit();}
+          alert("选择题至少有一个选项");
       }
-      //修改标题时确定按钮
-      function edit_poll_question(doc,id)
+      else
       {
-          var title = $.trim($("#poll_questions_title_" + id).val());
-          if(title.length == 0){alert("标题不能为空");}else{doc.parent().parent().parent().submit();}
+          doc.parent().remove();
       }
+  }
 
-      //问卷头
-      function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
-      function pollsSubmit(doc){
-          var title = $.trim($("#polls_title").val());
-          if(title.length == 0){alert("问卷标题不能为空");}else{doc.parent().parent().parent().submit();}
-      }
-      function pollsEdit(){$("#polls_head_edit").show();$("#polls_head_show").hide();}
-      //
-      function pollQuestionCancel(question_id){
-          $("#show_poll_questions_"+question_id).show();
-          $("#edit_poll_questions_"+question_id).hide();
-      }
-      function pollQuestionEdit(question_id){
-          $("#show_poll_questions_"+question_id).hide();
-          $("#edit_poll_questions_"+question_id).show();
-          $("#poll_questions_title_"+question_id).focus();
-      }
-      //单选题
-      function add_single_answer(doc)
+  function poll_submit()
+  {
+      var title = $.trim($("#polls_name_h").html());
+      if(title.length == 0)
       {
-          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>");
+          alert("问卷标题不能为空");
       }
-      function remove_single_answer(doc)
-      {
-          if(doc.parent().siblings("li").length == 0)
-          {
-              alert("选择题至少有一个选项");
-          }
-          else
-          {
-              doc.parent().remove();
-          }
+      else{
+          $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll,:is_remote => false}) %>');
+          showModal('ajax-modal', '310px');
+          $('#ajax-modal').css('height','120px');
+          $('#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");
       }
-
-      function poll_submit()
-      {
-          var title = $.trim($("#polls_name_h").html());
-          if(title.length == 0)
-          {
-              alert("问卷标题不能为空");
-          }
-          else{
-              $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { :poll => @poll,:is_remote => false}) %>');
-              showModal('ajax-modal', '310px');
-              $('#ajax-modal').css('height','120px');
-              $('#ajax-modal').siblings().remove();
-              $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-                      "<a href='#' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-              $('#ajax-modal').parent().removeClass("alert_praise");
-              $('#ajax-modal').parent().css("top","").css("left","");
-              $('#ajax-modal').parent().addClass("popbox_polls");
-          }
-      }
-  </script>
-</head>
-
-<body>
+  }
+</script>
 <div class=" polls_content polls_edit" id="polls">
 
   <!-- 头部 -->
@@ -116,7 +107,7 @@
     <%= render :partial => 'poll_content', :locals => {:poll => @poll}%>
   </div>
 
-  <div class="tabs_1">
+  <div class="tabs">
     <ul class="tabs_list">
       <li class="tab_item02 "  >
         <a title="<%=  l(:label_MC) %>" class="tab_icon icon_radio" onclick="add_MC();">
@@ -150,9 +141,11 @@
     <a class="ur_button_submit" onclick="poll_submit();">
       <%= l(:label_memo_create)%>
     </a>
+    <div class="polls_cha">
+      <input type="checkbox" name="" value="" >
+      <label for="">允许学生查看调查结果</label>
+    </div>
   </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
index b4ecdd3d1..7ece5d23c 100644
--- a/app/views/poll/_show_head.html.erb
+++ b/app/views/poll/_show_head.html.erb
@@ -1,8 +1,6 @@
-<div class="ur_page_head ur_editor02"><!--头部显示 start-->
+<div class="ur_page_head ur_editor02" ><!--头部显示 start-->
   <a href="#" class="ur_icon_edit" title="编辑" onclick="pollsEdit();"></a>
-  <h1 class="ur_page_title" id="polls_name_h">
-    <%= poll.polls_name%>
-  </h1>
+  <h1 class="ur_page_title"><%= poll.polls_name%></h1>
   <%= @poll.polls_description.nil? ? "" : @poll.polls_description.html_safe%>
   <div class="cl"></div>
 </div><!--头部显示 end-->
\ No newline at end of file

From 165977b9bf813790850c25a858d5f4704f899c6d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 24 Mar 2015 17:00:52 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=98=AF=E6=8A=A5=E6=A0=87=E9=A2=98=E4=B8=8D=E8=83=BD=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/views/poll/_show_head.html.erb b/app/views/poll/_show_head.html.erb
index 7ece5d23c..fc6401615 100644
--- a/app/views/poll/_show_head.html.erb
+++ b/app/views/poll/_show_head.html.erb
@@ -1,6 +1,6 @@
 <div class="ur_page_head ur_editor02" ><!--头部显示 start-->
   <a href="#" class="ur_icon_edit" title="编辑" onclick="pollsEdit();"></a>
-  <h1 class="ur_page_title"><%= poll.polls_name%></h1>
+  <h1 class="ur_page_title" id="polls_name_h"><%= poll.polls_name%></h1>
   <%= @poll.polls_description.nil? ? "" : @poll.polls_description.html_safe%>
   <div class="cl"></div>
 </div><!--头部显示 end-->
\ No newline at end of file