From 2450bb777dde5f5167d9f8184716e0e10a010840 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 23 Jan 2015 15:10:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E5=8D=B7?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=95=8C=E9=9D=A2=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/statistics_result.html.erb | 53 +++++++++++++---------- public/stylesheets/polls.css | 22 +++++----- 2 files changed, 42 insertions(+), 33 deletions(-) diff --git a/app/views/poll/statistics_result.html.erb b/app/views/poll/statistics_result.html.erb index a33daacfb..fd78d9230 100644 --- a/app/views/poll/statistics_result.html.erb +++ b/app/views/poll/statistics_result.html.erb @@ -2,34 +2,43 @@ - <%= l(:label_poll_result) %> + + <%= l(:label_poll_result) %> + <%= stylesheet_link_tag 'polls', :media => 'all' %>
-

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

+

+ <%= @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 %> - -
-
+
+ <% @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%> +
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css index a4e2010f0..da775ec2a 100644 --- a/public/stylesheets/polls.css +++ b/public/stylesheets/polls.css @@ -1,17 +1,17 @@ /* 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;} -#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;} +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; }*/ From 6dad5bb416df58eec1a9f3c25eb3aa906928b037 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 23 Jan 2015 15:15:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E5=8D=B7?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E7=95=8C=E9=9D=A2margin?= 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 da775ec2a..282ef5dad 100644 --- a/public/stylesheets/polls.css +++ b/public/stylesheets/polls.css @@ -41,7 +41,7 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;} /*问卷页面*/ -.polls_box{ border:1px solid #dcdcdc; padding:15px 30px;} +.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;} .ur_prefix_content{ color:#656565; text-indent:30px; margin-top:10px; } .ur_card{border-top:1px solid #dcdcdc;margin-top:20px; color:#3a3a3a;} From a093537ba40845688cd4ea4b6850ea13abce581d Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 23 Jan 2015 15:23:13 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=97=AE=E5=8D=B7=E6=97=B6=E6=A1=86=E6=A1=86?= 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 282ef5dad..370a3c515 100644 --- a/public/stylesheets/polls.css +++ b/public/stylesheets/polls.css @@ -113,7 +113,7 @@ a:hover.icon_add{background:url(images/icons.png) -20px -310px no-repeat;} 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;} +.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; } 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;}