jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
sw 2015-01-17 13:56:11 +08:00
parent 8e017425cf d9772ff2d0
commit c43c6a8c3f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/poll_controller.rb
View File

@ -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

4
app/helpers/poll_helper.rb
View File

@ -63,9 +63,9 @@ module PollHelper
when 2
"多选题"
when 3
"单行主观"
"单行主观题"
else
"多行主观"
"多行主观题"
end
end

2
app/views/poll/_quiz_answers.html.erb
View File

@ -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">

4
public/stylesheets/polls.css
View File

@ -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;}