From 7b2d9491b3292e558da42fe646a2b2c269e7ff33 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 17 Apr 2017 11:01:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E9=97=AE=E5=8D=B7=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E5=A4=9A=E8=A1=8C=E4=B8=BB=E8=A7=82=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_poll_form.html.erb     | 34 +++++++++++++-------------
 app/views/poll/_poll_tool_bar.html.erb |  3 ++-
 public/stylesheets/css/courses.css     |  2 +-
 public/stylesheets/polls.css           |  2 +-
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index a95d06d5c..afd370c10 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -75,8 +75,8 @@ function add_MC(){
                       '<label class="questionLabel mt8">问题：&nbsp;&nbsp;</label>'+
                       '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
                       '<input type="hidden" name="question_type" value="1"/>'+
-                      '<textarea  maxlength="250" class="questionTitle w570" type="text" name="poll_questions_title" id="poll_questions_title" placeholder="请输入单选题题目"></textarea>'+
-                      '<input type="checkbox" name="is_necessary" value="true" checked/>'+
+                      '<textarea  maxlength="250" class="questionTitle w570 ml3" type="text" name="poll_questions_title" id="poll_questions_title" placeholder="请输入单选题题目"></textarea>'+
+                      '<input class="ml3" type="checkbox" name="is_necessary" value="true" checked/>'+
                       '<label>必答</label>'+
                       '</div>'+
                       '<div class="ur_editor_content">'+
@@ -164,8 +164,8 @@ function insert_MCQ(quest_type,quest_id){
                         '<label class="questionLabel mt8">问题：&nbsp;&nbsp;</label>'+
                 '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
                 '<input type="hidden" name="question_type" value="2"/>'+
-                        '<textarea maxlength="250" class="questionTitle w570" type="text" name="poll_questions_title" id="poll_questions_title" placeholder="请输入多选题题目"></textarea>'+
-                        '<input type="checkbox" name="is_necessary" value="true" checked/>'+
+                        '<textarea maxlength="250" class="questionTitle w570 ml3" type="text" name="poll_questions_title" id="poll_questions_title" placeholder="请输入多选题题目"></textarea>'+
+                        '<input class="ml3" type="checkbox" name="is_necessary" value="true" checked/>'+
                 '<label>必答</label>'+
                 '</div>'+
                 '<div class="ur_editor_content">'+
@@ -279,8 +279,8 @@ function insert_MCQ(quest_type,quest_id){
                       '<label for="ur_question_title" class="questionLabel mt8">问题：&nbsp;&nbsp;</label>'+
                       '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
               '<input type="hidden" name="question_type" value="3"/>'+
-                      '<textarea maxlength="250" id="poll_questions_title" class="questionTitle w570" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入单行主观题"></textarea>'+
-                      '<input type="checkbox" name="is_necessary" value="true" checked/>'+
+                      '<textarea maxlength="250" id="poll_questions_title" class="questionTitle w570 ml3" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入单行主观题"></textarea>'+
+                      '<input class="ml3" type="checkbox" name="is_necessary" value="true" checked/>'+
               '<label for="ur_question_require">必答</label>'+
               '</div>'+
               '<div class="ur_editor_footer">'+
@@ -333,12 +333,12 @@ function insert_MCQ(quest_type,quest_id){
               '<div class="questionEditContainer">'+
                       '<div class="ur_editor_title">'+
                       '<label for="ur_question_title" class="questionLabel mt8">问题：&nbsp;&nbsp;</label>'+
-                      '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
                       '<input type="hidden" name="question_type" value="4"/>'+
-                      '<textarea maxlength="250" id="poll_questions_title" class="questionTitle w570" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入多行主观题的问题描述"></textarea>'+
-                      '<label><input type="checkbox" name="is_necessary" value="true" checked/>'+
+                      '<textarea maxlength="250" id="poll_questions_title" class="questionTitle w570 ml3" contenteditable="true" type="text" name="poll_questions_title"  placeholder="请输入多行主观题的问题描述"></textarea>'+
+                      '<label class="ml3"><input type="checkbox" name="is_necessary" value="true" checked/>'+
               '必答</label>'+
               '</div>'+
+              '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
               '<div class="ur_editor_content">'+
               '<ul>'+
               '<li class="ur_item new_answer">'+
@@ -619,26 +619,26 @@ function insert_MCQ(quest_type,quest_id){
   <div class="testQuestion">
     <span class="fl mt10 mr18">题型</span>
     <ul class="tabs_list fl">
-      <li class="tab_item02 mr95">
+      <li class="tab_item02">
         <a title="<%=  l(:label_MC) %>" class="tab_icon icon_radio" onclick="add_MC();">
           <%=  l(:label_MC) %>
         </a>
       </li>
-      <li class="tab_item02 mr95" >
+      <li class="tab_item02">
         <a title="<%=  l(:label_MCQ) %>" class=" tab_icon icon_checkbox" onclick="add_MCQ();">
           <%=  l(:label_MCQ) %>
         </a>
       </li>
-      <li class="tab_item02 " >
+      <li class="tab_item02">
         <a title="<%= l(:label_subjective) %>" class="tab_icon icon_text" onclick="add_single();">
           <%= l(:label_subjective) %>
         </a>
       </li>
-      <!--<li class="tab_item02 " >-->
-        <!--<a title="<%#= l(:label_mulit)%>" class="tab_icon icon_textarea" onclick="add_mulit();">-->
-          <!--<%#= l(:label_mulit)%>-->
-        <!--</a>-->
-      <!--</li>-->
+      <li class="tab_item02">
+        <a title="<%= l(:label_mulit)%>" class="tab_icon icon_textarea" onclick="add_mulit();">
+          <%= l(:label_mulit)%>
+        </a>
+      </li>
     </ul>
     <div class="cl"></div>
   </div><!--选项 end-->
diff --git a/app/views/poll/_poll_tool_bar.html.erb b/app/views/poll/_poll_tool_bar.html.erb
index 63647d1b6..d25c29acd 100644
--- a/app/views/poll/_poll_tool_bar.html.erb
+++ b/app/views/poll/_poll_tool_bar.html.erb
@@ -17,7 +17,8 @@
   <ul class="poll-add-menu fontGrey3">
   <li><a href="javascript:void(0);" onclick=" dismiss('<%=type %>',<%=poll_question.id%>);insert_MC('<%=type %>',<%=poll_question.id%>);">单选题</a></li>
   <li><a href="javascript:void(0);" onclick=" dismiss('<%=type %>',<%=poll_question.id%>);insert_MCQ('<%=type %>',<%=poll_question.id%>);">多选题</a></li>
-  <li><a href="javascript:void(0);" onclick=" dismiss('<%=type %>',<%=poll_question.id%>);insert_SINGLE('<%=type %>',<%=poll_question.id%>);">主观题</a></li>
+  <li><a href="javascript:void(0);" onclick=" dismiss('<%=type %>',<%=poll_question.id%>);insert_SINGLE('<%=type %>',<%=poll_question.id%>);">单行主观题</a></li>
+  <li><a href="javascript:void(0);" onclick=" dismiss('<%=type %>',<%=poll_question.id%>);insert_MULIT('<%=type %>',<%=poll_question.id%>);">多行主观题</a></li>
   </ul>
 </div>
 
diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css
index 17ab3f095..dc7cd9313 100644
--- a/public/stylesheets/css/courses.css
+++ b/public/stylesheets/css/courses.css
@@ -470,7 +470,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
 .poll-delete:hover{ background:url(/images/course/icons.png) -17px -343px no-repeat;}
 .poll-edit{ background:url(/images/course/icons.png) 0px -272px no-repeat; width:16px; height:27px; display:block;float:right;}
 .poll-edit:hover{ background:url(/images/course/icons.png) -21px -272px  no-repeat;}
-.poll-add-menu {border:1px solid #eaeaea; background:#fff; padding:5px 8px; width:50px; left:0px; top:20px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); display:none;}
+.poll-add-menu {border:1px solid #eaeaea; background:#fff; padding:5px 8px; width:60px; left:0px; top:20px; position:absolute; z-index:9999; line-height:2; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); display:none;}
 .poll-multiple-limit {width:70px; outline: none;}
 /*黄色边框的提示信息 */
 .ye_tips_box_inner{ position: absolute;line-height: 1.5;padding: 5px 10px; white-space: nowrap; background-color: #FFFEF4; left:30px; top: -5px; border: solid 1px #F3DDB3;}
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index e992f8ffd..56f6fb4f3 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -153,7 +153,7 @@ a:hover.btn_pu{ background:#3cb761;}
 .polls_alert_box_p{ font-size:14px; padding-left: 45px;padding-top: 10px;}
 
 .import_poll_div{width: 430px; max-height: 550px; overflow-x:hidden; overflow-y: auto; margin: 10px auto;}
-
+.w520 {width: 520px !important;}
 /*测验*/
 .exercise_inputs{ color:#666;}
 .exercise_inputs tr td{ width:98%; float: right;}