diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb index ce031f586..8385b0fde 100644 --- a/app/controllers/poll_controller.rb +++ b/app/controllers/poll_controller.rb @@ -30,7 +30,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 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 @@ <% poll_question.poll_votes.each do |poll_vote| %> - <%= poll_vote.vote_text %>dddd + <%= poll_vote.vote_text.html_safe %> <% end %> diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css index e14565b50..d0622aaad 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;}