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

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

app/views/poll/_poll_form.html.erb

@@ -59,7 +59,7 @@
       {
           $('#ajax-modal').html('<%= escape_javascript(render :partial => 'poll_submit', locals: { poll: @poll}) %>');
           showModal('ajax-modal', '310px');
-          $('#ajax-modal').css('height','100px');
+          $('#ajax-modal').css('height','110px');
           $('#ajax-modal').siblings().remove();
           $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
                   "<a href='#' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");

app/views/poll/_show_MC.html.erb

@@ -4,10 +4,10 @@
       第<%= poll_question.question_number%>题：
     </span>
     <%= poll_question.question_title %>
+    <span class="title_index">[单选题]</span>
     <%if poll_question.is_necessary == 1%>
         <span class="ur_required" title="必答">*</span>
     <%end%>
-    (单选题)
   </div>
   <%= 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")  %>

app/views/poll/_show_MCQ.html.erb

@@ -4,10 +4,10 @@
       第<%= poll_question.question_number%>题：
     </span>
     <%= poll_question.question_title %>
+    <span class="title_index">[多选题]</span>
     <%if poll_question.is_necessary == 1%>
         <span class="ur_required" title="必答">*</span>
     <%end%>
-    (多选题)
   </div>
   <%= 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")  %>

app/views/poll/_show_mulit.html.erb

@@ -5,10 +5,10 @@
         第<%= poll_question.question_number%>题：
       </span>
       <%= poll_question.question_title %>
+      <span class="title_index">[多行主观]</span>
       <%if poll_question.is_necessary == 1%>
           <span class="ur_required" title="必答">*</span>
       <%end%>
-      (多行主观)
     </div>
     <%= 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")  %>

app/views/poll/_show_single.html.erb

@@ -4,10 +4,10 @@
       第<%= poll_question.question_number%>题：
     </span>
     <%= poll_question.question_title %>
+    <span class="title_index">[单行主观]</span>
     <%if poll_question.is_necessary == 1%>
         <span class="ur_required" title="必答">*</span>
     <%end%>
-    (单行主观)
   </div>
   <%= 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")  %>

app/views/poll/show.html.erb

@@ -48,6 +48,7 @@
                 <div class="ur_title">
                   <span class="title_index"><%= l(:label_question_number,:question_number => pq.question_number) %></span>
                   <%= pq.question_title %>
+                  <span class="title_index">[单选题]</span>
                   <% if pq.is_necessary == 1 %>
                     <span class="ur_required" title="<%= l(:label_must_answer) %>">*</span>
                   <% end %>
@@ -97,6 +98,7 @@
                 <div class="ur_title">
                   <span class="title_index"><%= l(:label_question_number,:question_number => pq.question_number) %></span>
                   <%= pq.question_title %>
+                  <span class="title_index">[多选题]</span>
                   <% if pq.is_necessary == 1 %>
                       <span class="ur_required" title="<%= l(:label_must_answer) %>">*</span>
                   <% end %>
@@ -153,6 +155,7 @@
                 <div class="ur_title">
                   <span class="title_index"><%= l(:label_question_number,:question_number => pq.question_number) %></span>
                   <%= pq.question_title %>
+                  <span class="title_index">[单行主观]</span>
                   <% if pq.is_necessary == 1 %>
                       <span class="ur_required" title="<%= l(:label_must_answer) %>">*</span>
                   <% end %>
@@ -190,6 +193,7 @@
                   <div class="ur_title">
                     <span class="title_index"><%= l(:label_question_number,:question_number => pq.question_number) %></span>
                     <%= pq.question_title %>
+                    <span class="title_index">[多行主观]</span>
                     <% if pq.is_necessary == 1 %>
                         <span class="ur_required" title="<%= l(:label_must_answer) %>">*</span>
                     <% end %>

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