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

app/helpers/poll_helper.rb

@@ -62,8 +62,10 @@ module PollHelper
       "单选题"
     when 2
       "多选题"
+    when 3
+      "单行主观"
     else
-      "问答题"
+      "多行主观"
     end
   end
   

app/views/poll/_quiz_answers.html.erb

@@ -0,0 +1,18 @@
+<div class="ur_table_result">
+  <table  border="0" cellspacing="0" cellpadding="0" >
+    <tbody>
+      <tr class="table_bluebg">
+        <td class="td327" ><%= l(:label_answer) %> </td>
+      </tr>
+      <% poll_question.poll_votes.each do |poll_vote| %>
+      	<tr>     		
+          <td class="td111"><%= poll_vote.vote_text %>dddd </td>
+      	</tr>     
+      <% end %>
+        <tr class="table_bluebg">
+          <td class="td327"><%= l(:label_poll_answer_valid_result) %> <%= l(:label_answer_total) %><%= poll_question.poll_votes.count %></td>
+        </tr>
+     </tbody>
+   </table>
+</div>
+

app/views/poll/show.html.erb

@@ -180,7 +180,7 @@
 
                       }
                   </script>
-                  <input class="ur_text ur_textbox" type="text" size="" maxlength="" value="<%= get_anwser_vote_text(pq.id,User.current.id).html_safe %>" onblur="onblur_<%= pq.id %>(this);" <%= @can_edit_poll?"":"disabled=disabled" %>>
+                  <input class="ur_text ur_textbox" type="text" size="" maxlength="" style="width: 100%" value="<%= get_anwser_vote_text(pq.id,User.current.id).html_safe %>" onblur="onblur_<%= pq.id %>(this);" <%= @can_edit_poll?"":"disabled=disabled" %>>
                 </div>
               </li><!--单行输入 end-->
           <% elsif pq.question_type == 4 %>

app/views/poll/statistics_result.html.erb

@@ -10,14 +10,18 @@
 	  <div class="ur_page_head" >
 		<h1 class="ur_page_title"><%= @poll.polls_name %> <%= l(:label_poll) %></h1>
 	  </div> 
-      <% @poll_questions.each do |poll_question| %>
 	  <div class="">
+      <% @poll_questions.each do |poll_question| %>	  
 	    <ol>
 		  <li class="ur_question_item">
 		    <div class="ur_title_result">
 			  <span class="title_index">第<%= poll_question.question_number %>题：</span><%= poll_question.question_title %> <span class="title_index">[<%= options_show(poll_question.question_type) %>]</span>
 			</div>
-			  <%= render :partial =>'choice_show', :locals =>{ :poll_question => poll_question } %>
+			  <% 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 %>
 		  </li>
 		</ol>
 	  <% end %>

config/locales/zh.yml

@@ -2262,5 +2262,7 @@ zh:
   label_poll_proportion: 比例
   label_poll_valid_commit: 本题有效填写人次
   label_poll_result: 问卷调查_问卷统计
-
+  label_answer: 答案
+  label_poll_answer_valid_result: 以上为有效问答题答案！
+  label_answer_total: 总计：
 

public/stylesheets/polls.css

@@ -68,6 +68,7 @@ a:hover.ur_button{ background:#0fa9bb; text-decoration:none;}
 .td327{ width:300px; padding-left:5px;}
 .td42{ width:42px; text-align:center;}
 .td287{ width:259px;padding-left:5px; }
+.td111{ width:601px;padding-left:5px; }
 .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;}
@@ -94,13 +95,13 @@ a:hover.tab_item02{ background:#fff;}
 
 .ur_editor {width:655px; border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px;}
 .ur_title_editor_title{ margin-bottom:10px;}
-.input_title{ width:630px; height:40px; padding:0 10px; text-align:center; font-size:16px; font-weight:bold;}
+.input_title{ width:630px; height:40px; padding:0 10px; text-align:center; font-size:16px; font-weight:bold;border: 1px solid #DCDCDC !important;}
-.textarea_editor{  width:632px; height:120px; padding:10px; margin-bottom:10px;}
+.textarea_editor{  width:632px; height:120px; padding:10px; margin-bottom:10px;border: 1px solid #DCDCDC !important;}
 .btn_submit{ width:56px; height:24px;  padding-top:4px;background:#15bccf; color:#fff; text-align:center; display:block; float:left; margin-right:10px;}
 a:hover.btn_submit{background:#0fa9bb;}
 .btn_cancel{width:54px; height:22px;  padding-top:4px;background:#fff; color:#999; border:1px solid #999; text-align:center; display:block; float:left; }
 a:hover.btn_cancel{ color:#666;}
-.ur_question_title{ width:534px; height:30px; border:1px solid #cbcbcb; padding:0 5px !important; margin-right:10px;}
+.ur_question_title{ width:534px; height:30px; border:1px solid #cbcbcb; padding:0 5px !important; margin-right:10px;border: 1px solid #DCDCDC !important;}
 .ur_editor_title{ margin-bottom:10px;}
 .ur_editor_content{ }
 .ur_item{ margin-bottom:5px; height:32px; }

public/themes/redpenny-master/stylesheets/application.css

@@ -851,8 +851,8 @@ p.breadcrumb
 
 input[type="text"],input[type="password"],textarea,select
 {
-  #padding:2px;
+  padding:2px;
-  #border:1px solid #039ea0
+  border:1px solid #039ea0
 }
 
 input[type="text"],input[type="password"]