From 26b39c5d202f9acde468e2774d6c5b86f1691b4b Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 25 Oct 2016 15:36:55 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E6=B5=8B=E9=AA=8C?=
 =?UTF-8?q?=E5=8D=95=E9=80=89=E9=A2=98=E9=AB=98=E5=BA=A6=E8=87=AA=E9=80=82?=
 =?UTF-8?q?=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_edit_MC.html.erb |  5 ++---
 app/views/exercise/_new_MC.html.erb  |  4 ++--
 app/views/exercise/_show_MC.html.erb | 12 +++++++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/views/exercise/_edit_MC.html.erb b/app/views/exercise/_edit_MC.html.erb
index 9dfa2c48f..af1446342 100644
--- a/app/views/exercise/_edit_MC.html.erb
+++ b/app/views/exercise/_edit_MC.html.erb
@@ -3,7 +3,6 @@
     <script type="text/javascript">
         function resetQuestion<%=exercise_question.id%>()
         {
-            $("#poll_questions_title_<%=exercise_question.id%>").val("<%= exercise_question.question_title%>")
             $("#poll_question_score_<%=exercise_question.id %>").val("<%= exercise_question.question_score%>")
             $("#poll_question_standard_answer_<%=exercise_question.id %>").val("<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s)%>")
             $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>" +
@@ -20,9 +19,9 @@
 
     <div class="questionContainer" style="width: 680px;">
       <div class="ur_editor_title">
-        <label>问题：&nbsp;&nbsp;</label>
+        <label class="questionLabel mt8">问题：&nbsp;&nbsp;</label>
         <input name="question_type" value="<%=exercise_question.question_type %>" type="hidden">
-        <input name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入单选题题目" type="text" value="<%=exercise_question.question_title %>">
+        <textarea name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入单选题题目" type="text" onfocus="autoHeight('#poll_questions_title_<%=exercise_question.id %>',30)"><%=exercise_question.question_title %></textarea>
       </div>
       <div class="ur_editor_content">
         <ul>
diff --git a/app/views/exercise/_new_MC.html.erb b/app/views/exercise/_new_MC.html.erb
index a0b8f1344..054285825 100644
--- a/app/views/exercise/_new_MC.html.erb
+++ b/app/views/exercise/_new_MC.html.erb
@@ -4,9 +4,9 @@
              :remote=>true ) do |f| %>
 <div class="questionContainer">
   <div class="ur_editor_title">
-    <label>问题：&nbsp;&nbsp;</label>
+    <label class="questionLabel mt8">问题：&nbsp;&nbsp;</label>
     <input name="question_type" value="1" type="hidden">
-    <input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入单选题题目" type="text">
+    <textarea name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入单选题题目" type="text" oninput="autoHeight('#poll_questions_title',30)"></textarea>
   </div>
   <div class="ur_editor_content">
     <ul>
diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb
index d0a606a84..94b8e9d57 100644
--- a/app/views/exercise/_show_MC.html.erb
+++ b/app/views/exercise/_show_MC.html.erb
@@ -1,6 +1,7 @@
 <div>
-  <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
-    <%= exercise_question.question_title %>
+  <div class="testEditTitle">
+    <div>第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)</div>
+    <span class="formatContainer break_word" style="max-width:534px;"><%= exercise_question.question_title %></span>
     <span class="ml10">(<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)</span>
   </div>
 
@@ -46,7 +47,7 @@
                                 '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
                                 '<input type="hidden" name="quest_num" value="'+quest_num+'"/>'+
                                 '<input type="hidden" name="question_type" value="1"/>'+
-                                '<input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入单选题题目" type="text"/>'+
+                                '<textarea name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入单选题题目" type="text"></textarea>'+
                                 '</div>'+
                                 '<div class="ur_editor_content">'+
                                 '<ul>'+
@@ -105,6 +106,11 @@
                 $("#add_new_question").one('click', function(){
                     add_poll_question($(this),1);
                 });
+                $(".questionTitle").on("input",function(){
+                    $(this).height(30);
+                    var scrollVal = $(this)[0].scrollHeight;
+                    $(this).height(scrollVal);
+                });
                 }
        }
         else {

From 5b2df31c95f04bd9c26a941b8b9025b4dd084ecb Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 25 Oct 2016 15:47:26 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E6=B5=8B=E9=AA=8C?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89=E9=A2=98=E9=A2=98=E7=9B=AE=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_edit_MCQ.html.erb |  5 ++---
 app/views/exercise/_new_MCQ.html.erb  |  4 ++--
 app/views/exercise/_show_MCQ.html.erb | 12 +++++++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/views/exercise/_edit_MCQ.html.erb b/app/views/exercise/_edit_MCQ.html.erb
index 186cebd18..68737bb57 100644
--- a/app/views/exercise/_edit_MCQ.html.erb
+++ b/app/views/exercise/_edit_MCQ.html.erb
@@ -3,7 +3,6 @@
     <script type="text/javascript">
         function resetQuestion<%=exercise_question.id%>()
         {
-            $("#poll_questions_title_<%=exercise_question.id%>").val("<%= exercise_question.question_title%>")
             $("#poll_question_score_<%=exercise_question.id %>").val("<%= exercise_question.question_score%>")
             $("#poll_question_standard_answer_<%=exercise_question.id %>").val("<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s)%>")
             $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>" +
@@ -20,9 +19,9 @@
 
     <div class="questionContainer" style="width: 680px;">
       <div class="ur_editor_title">
-        <label>问题：&nbsp;&nbsp;</label>
+        <label class="questionLabel mt8">问题：&nbsp;&nbsp;</label>
         <input name="question_type" value="<%=exercise_question.question_type %>" type="hidden">
-        <input name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入多选题题目" type="text" value="<%=exercise_question.question_title %>">
+        <textarea name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入多选题题目" type="text" onfocus="autoHeight('#poll_questions_title_<%=exercise_question.id %>',30)"><%=exercise_question.question_title %></textarea>
       </div>
       <div class="ur_editor_content">
         <ul>
diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb
index 11ec08d05..d8dbf0adb 100644
--- a/app/views/exercise/_new_MCQ.html.erb
+++ b/app/views/exercise/_new_MCQ.html.erb
@@ -4,9 +4,9 @@
              :remote=>true ) do |f| %>
 <div class="questionContainer">
   <div class="ur_editor_title">
-    <label>问题：&nbsp;&nbsp;</label>
+    <label class="questionLabel mt8">问题：&nbsp;&nbsp;</label>
     <input name="question_type" value="2" type="hidden">
-    <input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入多选题题目" type="text">
+    <textarea name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入多选题题目" type="text" oninput="autoHeight('#poll_questions_title',30)"></textarea>
   </div>
   <div class="ur_editor_content">
     <ul>
diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb
index f122e1256..b2ce0f77d 100644
--- a/app/views/exercise/_show_MCQ.html.erb
+++ b/app/views/exercise/_show_MCQ.html.erb
@@ -1,6 +1,7 @@
 <div>
-  <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
-    <%= exercise_question.question_title %>
+  <div class="testEditTitle">
+    <div>第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)</div>
+    <span class="formatContainer break_word" style="max-width:534px;"><%= exercise_question.question_title %></span>
     <span class="ml10">(<%= convert_to_char(exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s) %>)</span>
   </div>
   <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number),
@@ -45,7 +46,7 @@
                                 '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
                                 '<input type="hidden" name="quest_num" value="'+quest_num+'"/>'+
                                 '<input type="hidden" name="question_type" value="2"/>'+
-                                '<input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入多选题题目" type="text"/>'+
+                                '<textarea name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入多选题题目" type="text"></textarea>'+
                                 '</div>'+
                                 '<div class="ur_editor_content">'+
                                 '<ul>'+
@@ -104,6 +105,11 @@
                 $("#add_new_question").one('click', function(){
                     add_poll_question($(this),2);
                 });
+                $(".questionTitle").on("input",function(){
+                    $(this).height(30);
+                    var scrollVal = $(this)[0].scrollHeight;
+                    $(this).height(scrollVal);
+                });
         }
         }else {
             $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");

From d44744cfd7c5e2dbccd73d7cb1fb9f19410cf2c2 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Tue, 25 Oct 2016 15:55:48 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E6=B5=8B=E9=AA=8C?=
 =?UTF-8?q?=E9=97=AE=E7=AD=94=E9=A2=98=E6=94=AF=E6=8C=81=E5=9B=9E=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/exercise/_edit_single.html.erb |  5 ++---
 app/views/exercise/_new_single.html.erb  |  4 ++--
 app/views/exercise/_show_single.html.erb | 12 +++++++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/views/exercise/_edit_single.html.erb b/app/views/exercise/_edit_single.html.erb
index 42878454d..d1b8cd155 100644
--- a/app/views/exercise/_edit_single.html.erb
+++ b/app/views/exercise/_edit_single.html.erb
@@ -3,7 +3,6 @@
     <script type="text/javascript">
         function resetQuestion<%=exercise_question.id%>()
         {
-            $("#poll_questions_title_<%=exercise_question.id%>").val("<%= exercise_question.question_title%>")
             $("#poll_question_score_<%=exercise_question.id %>").val("<%= exercise_question.question_score%>")
             $("#poll_answers_<%=exercise_question.id%>").html("<% exercise_question.exercise_standard_answers.reorder("created_at").each_with_index do |exercise_choice,index| %>" +
                     "<li class='ur_item'>" +
@@ -20,9 +19,9 @@
 
     <div class="questionContainer" style="width: 680px;">
       <div class="ur_editor_title">
-        <label>问题：&nbsp;&nbsp;</label>
+        <label class="questionLabel mt8">问题：&nbsp;&nbsp;</label>
         <input name="question_type" value="<%=exercise_question.question_type %>" type="hidden">
-        <input name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入填空题的内容（注意：目前填空题暂时仅支持一个空）" type="text" value="<%=exercise_question.question_title %>">
+        <textarea name="question_title" id="poll_questions_title_<%=exercise_question.id %>" class="questionTitle" placeholder="请输入填空题的内容（注意：目前填空题暂时仅支持一个空）" type="text" onfocus="autoHeight('#poll_questions_title_<%=exercise_question.id %>',30)"><%=exercise_question.question_title %></textarea>
       </div>
       <div class="ur_editor_content" id="edit_single">
         <ul>
diff --git a/app/views/exercise/_new_single.html.erb b/app/views/exercise/_new_single.html.erb
index 24a0ad047..d0fce87c8 100644
--- a/app/views/exercise/_new_single.html.erb
+++ b/app/views/exercise/_new_single.html.erb
@@ -4,9 +4,9 @@
              :remote=>true ) do |f| %>
 <div class="questionContainer">
   <div class="ur_editor_title">
-    <label>问题：&nbsp;&nbsp;</label>
+    <label class="questionLabel mt8">问题：&nbsp;&nbsp;</label>
     <input name="question_type" value="3" type="hidden">
-    <input maxlength="250" class="questionTitle" name="question_title" id="poll_questions_title" placeholder="请输入填空题的内容（注意：目前填空题暂时仅支持一个空）" type="text">
+    <textarea maxlength="250" class="questionTitle" name="question_title" id="poll_questions_title" placeholder="请输入填空题的内容（注意：目前填空题暂时仅支持一个空）" type="text" oninput="autoHeight('#poll_questions_title',30)"></textarea>
   </div>
   <div class="ur_editor_content" id="new_single">
     <ul>
diff --git a/app/views/exercise/_show_single.html.erb b/app/views/exercise/_show_single.html.erb
index e559805fe..b476d8a2b 100644
--- a/app/views/exercise/_show_single.html.erb
+++ b/app/views/exercise/_show_single.html.erb
@@ -1,6 +1,7 @@
 <div>
-  <div class="testEditTitle"> 第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)<br />
-    <%= exercise_question.question_title %>
+  <div class="testEditTitle">
+    <div>第<%= exercise_question.question_number%>题.(<%= exercise_question.question_score %>分)</div>
+    <span class="formatContainer break_word"><%= exercise_question.question_title %></span>
   </div>
   <%= link_to("", delete_exercise_question_exercise_index_path(:exercise_question => exercise_question.id, :quest_num => exercise_question.question_number),
               method: :delete, :confirm => l(:text_are_you_sure), :remote => true,  :class => "ur_icon_de",:title => "删除") %>
@@ -33,7 +34,7 @@
                                 '<input type="hidden" name="quest_id" value="'+quest_id+'"/>'+
                                 '<input type="hidden" name="quest_num" value="'+quest_num+'"/>'+
                                 '<input type="hidden" name="question_type" value="3"/>'+
-                                '<input name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入填空题的内容（注意：目前填空题暂时仅支持一个空）" type="text"/>'+
+                                '<textarea name="question_title" id="poll_questions_title" class="questionTitle" placeholder="请输入填空题的内容（注意：目前填空题暂时仅支持一个空）" type="text"></textarea>'+
                                 '</div>'+
                                 '<div class="ur_editor_content" id="new_single">'+
                                 '<ul>'+
@@ -80,6 +81,11 @@
                 $("#add_new_question").one('click', function(){
                     add_poll_question($(this),3);
                 });
+                $(".questionTitle").on("input",function(){
+                    $(this).height(30);
+                    var scrollVal = $(this)[0].scrollHeight;
+                    $(this).height(scrollVal);
+                });
             }
         } else {
             $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html("");