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 @@ <%= l(:label_poll_proportion) %> <% poll_question.poll_answers.each do |poll_answer| %> - - <%= poll_answer.answer_text %> - <%= poll_answer.poll_votes.count %> - -
- -
- <%= statistics_result_percentage(poll_answer.poll_votes.count, total_answer(poll_question.id)) %>% - + + <%= poll_answer.answer_text %> + <%= poll_answer.poll_votes.count %> + +
+ +
+ <%= statistics_result_percentage(poll_answer.poll_votes.count, total_answer(poll_question.id)) %>% + <% end %> - - <%= l(:label_poll_valid_commit) %> - <%= total_answer(poll_question.id) %> -   - + + <%= l(:label_poll_valid_commit) %> + <%= total_answer(poll_question.id) %> +   + 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 @@
- +
- + <% poll_question.poll_votes.each do |poll_vote| %> - + <% end %> - +
<%= l(:label_answer) %> <%= l(:label_answer) %>
<%= poll_vote.vote_text.html_safe %> <%= poll_vote.vote_text.html_safe %>
<%= l(:label_poll_answer_valid_result) %> <%= l(:label_answer_total) %><%= poll_question.poll_votes.count %> + <%= l(:label_poll_answer_valid_result) %> + <%= l(:label_answer_total) %> + <%= poll_question.poll_votes.count %> +
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 @@ - - - - - - <%= l(:label_poll_result) %> - - <%= stylesheet_link_tag 'polls', :media => 'all' %> - - -
-
-

- <%= @poll.polls_name %> - <%= l(:label_poll) %> -

-
-
- <% @poll_questions.each do |poll_question| %> -
    -
  1. -
    +<%= stylesheet_link_tag 'polls', :media => 'all' %> +
    +
    +

    + <%= @poll.polls_name %> + <%= l(:label_poll) %> +

    +
    +
    + <% @poll_questions.each do |poll_question| %> +
      +
    1. +
      第<%= poll_question.question_number %>题： - <%= poll_question.question_title %> - - [<%= options_show(poll_question.question_type) %>] - -
      - <% 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 %> -
      2. -
    - <% end %> -
      - <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> -
    -
    -
    -
    - - + <%= poll_question.question_title %> + + [<%= options_show(poll_question.question_type) %>] + +
    + <% 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 %> +
    2. +
+ <% end %> +
    + <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%> +
+
+
+
\ 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; }