From 8a05e032af91fedf3962ff7d0809e3f9d038b429 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 17 Jan 2015 14:10:44 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=98=E5=9E=8B?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=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_MC.html.erb | 2 +- app/views/poll/_show_MCQ.html.erb | 2 +- app/views/poll/_show_mulit.html.erb | 2 +- app/views/poll/_show_single.html.erb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/poll/_show_MC.html.erb b/app/views/poll/_show_MC.html.erb index 594baea9d..ff8e52f25 100644 --- a/app/views/poll/_show_MC.html.erb +++ b/app/views/poll/_show_MC.html.erb @@ -4,10 +4,10 @@ 第<%= poll_question.question_number%>题： <%= poll_question.question_title %> + [单选题] <%if poll_question.is_necessary == 1%> * <%end%> - (单选题) <%= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id), method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de") %> diff --git a/app/views/poll/_show_MCQ.html.erb b/app/views/poll/_show_MCQ.html.erb index 64e39523a..63b9d1c1f 100644 --- a/app/views/poll/_show_MCQ.html.erb +++ b/app/views/poll/_show_MCQ.html.erb @@ -4,10 +4,10 @@ 第<%= poll_question.question_number%>题： <%= poll_question.question_title %> + [多选题] <%if poll_question.is_necessary == 1%> * <%end%> - (多选题) <%= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id), method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de") %> diff --git a/app/views/poll/_show_mulit.html.erb b/app/views/poll/_show_mulit.html.erb index 23bdbe6eb..2d52fffb5 100644 --- a/app/views/poll/_show_mulit.html.erb +++ b/app/views/poll/_show_mulit.html.erb @@ -5,10 +5,10 @@ 第<%= poll_question.question_number%>题： <%= poll_question.question_title %> + [多行主观] <%if poll_question.is_necessary == 1%> * <%end%> - (多行主观) <%= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id), method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de") %> diff --git a/app/views/poll/_show_single.html.erb b/app/views/poll/_show_single.html.erb index bfea07d86..8caa7b1a5 100644 --- a/app/views/poll/_show_single.html.erb +++ b/app/views/poll/_show_single.html.erb @@ -4,10 +4,10 @@ 第<%= poll_question.question_number%>题： <%= poll_question.question_title %> + [单行主观] <%if poll_question.is_necessary == 1%> * <%end%> - (单行主观) <%= link_to("", delete_poll_question_poll_index_path(:poll_question => poll_question.id), method: :delete, :confirm => l(:text_are_you_sure), :remote => true, :class => "ur_icon_de") %> From 233070b277e209e7501d1538c7f42dc48bd5b4c2 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 17 Jan 2015 14:16:26 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=81=AB=E7=8B=90?= =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E4=B8=AD=E6=98=BE=E7=A4=BA=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= 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 d0622aaad..b1ef97def 100644 --- a/public/stylesheets/polls.css +++ b/public/stylesheets/polls.css @@ -49,7 +49,7 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;} .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;} +.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_inputs input{ margin-right:5px;} .ur_text{ height:30px;} From 26b3aab6a2fbd2b1e312b68d83640fa9bb40c444 Mon Sep 17 00:00:00 2001 From: z9hang Date: Sat, 17 Jan 2015 14:18:45 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A2=98=E5=9E=8B?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/show.html.erb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb index d20f46297..08c2608d0 100644 --- a/app/views/poll/show.html.erb +++ b/app/views/poll/show.html.erb @@ -48,6 +48,7 @@
<%= l(:label_question_number,:question_number => pq.question_number) %> <%= pq.question_title %> + [单选题] <% if pq.is_necessary == 1 %> * <% end %> @@ -97,6 +98,7 @@
<%= l(:label_question_number,:question_number => pq.question_number) %> <%= pq.question_title %> + [多选题] <% if pq.is_necessary == 1 %> * <% end %> @@ -153,6 +155,7 @@
<%= l(:label_question_number,:question_number => pq.question_number) %> <%= pq.question_title %> + [单行主观] <% if pq.is_necessary == 1 %> * <% end %> @@ -190,6 +193,7 @@
<%= l(:label_question_number,:question_number => pq.question_number) %> <%= pq.question_title %> + [多行主观] <% if pq.is_necessary == 1 %> * <% end %> From 155d48b7cb6ba68f3043e7ed176f765c443b0617 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 17 Jan 2015 14:41:33 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=AF=8F=E9=A1=B5=E6=98=BE=E7=A4=BA20=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/poll_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb index 8385b0fde..739adfe1c 100644 --- a/app/controllers/poll_controller.rb +++ b/app/controllers/poll_controller.rb @@ -12,7 +12,7 @@ class PollController < ApplicationController else polls = Poll.where("polls_type = 'Course' and polls_group_id = #{@course.id} and polls_status = 2") end - @polls = paginateHelper polls,10 #分页 + @polls = paginateHelper polls,20 #分页 respond_to do |format| format.html{render :layout => 'base_courses'} end From 2c6e53b9351b2ec239a48c0fa2763a9af0bd2224 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 17 Jan 2015 14:43:55 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E6=A1=86=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/_poll_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb index 49e04a3ba..aa5a0eca8 100644 --- a/app/views/poll/_poll_form.html.erb +++ b/app/views/poll/_poll_form.html.erb @@ -58,7 +58,7 @@ function poll_submit() { $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { poll: @poll}) %>'); - showModal('ajax-modal', '310px'); + showModal('ajax-modal', '315px'); $('#ajax-modal').css('height','100px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before("" + From 989ff4fcbea9edb55ff59521bb8a3f8c1acfd4d3 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 17 Jan 2015 14:46:49 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=B9=E5=87=BA?= =?UTF-8?q?=E6=A1=86=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/_poll_form.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb index aa5a0eca8..bbf71e0ce 100644 --- a/app/views/poll/_poll_form.html.erb +++ b/app/views/poll/_poll_form.html.erb @@ -58,8 +58,8 @@ function poll_submit() { $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { poll: @poll}) %>'); - showModal('ajax-modal', '315px'); - $('#ajax-modal').css('height','100px'); + showModal('ajax-modal', '310px'); + $('#ajax-modal').css('height','110px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before("" + "");