From 092dd61c86ba79a74454f680ec8ed3953b85f405 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Sat, 17 Jan 2015 11:51:59 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=B5=84=E6=96=99=E5=A4=84=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/show.html.erb                              | 2 +-
 public/stylesheets/polls.css                              | 6 +++---
 public/themes/redpenny-master/stylesheets/application.css | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/poll/show.html.erb b/app/views/poll/show.html.erb
index bc5136718..d20f46297 100644
--- a/app/views/poll/show.html.erb
+++ b/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 %>
diff --git a/public/stylesheets/polls.css b/public/stylesheets/polls.css
index e89e50be4..b238eedd8 100644
--- a/public/stylesheets/polls.css
+++ b/public/stylesheets/polls.css
@@ -94,13 +94,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;}
-.textarea_editor{  width:632px; height:120px; padding:10px; margin-bottom:10px;}
+.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;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; }
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index 897434393..936610c6b 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -851,8 +851,8 @@ p.breadcrumb
 
 input[type="text"],input[type="password"],textarea,select
 {
-  #padding:2px;
-  #border:1px solid #039ea0
+  padding:2px;
+  border:1px solid #039ea0
 }
 
 input[type="text"],input[type="password"]

From 4e19690887a77152884bfc33dc7e3c6a7eb55981 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 17 Jan 2015 11:58:19 +0800
Subject: [PATCH 2/4] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=A4=9A=E8=A1=8C=E4=B8=BB=E8=A7=82=E5=90=8E?=
 =?UTF-8?q?=E5=A4=9A=E8=A1=8C=E4=B8=BB=E8=A7=82=E4=BB=8E=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B6=88=E5=A4=B1=202.=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=90=8E=E5=8F=96=E6=B6=88=EF=BC=8C=E7=AC=AC=E4=BA=8C=E6=AC=A1?=
 =?UTF-8?q?=E8=BF=9B=E5=85=A5=E7=BC=96=E8=BE=91=E5=8D=B4=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=89=8D=E4=B8=80=E6=AC=A1=E7=BC=96=E8=BE=91=E7=9A=84=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=20#1810=20#1806?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/poll/_edit_MC.html.erb     | 23 ++++++++++++++++++++---
 app/views/poll/_edit_MCQ.html.erb    | 22 +++++++++++++++++++---
 app/views/poll/_edit_mulit.html.erb  | 11 +++++++++--
 app/views/poll/_edit_single.html.erb | 11 +++++++++--
 4 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index 505e9acc1..066eafe0d 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -1,15 +1,32 @@
 <%= form_for("",:url => update_poll_question_poll_index_path(:poll_question => poll_question.id),:remote => true) do |f|%>
     <!--编辑单选start-->
+    <script type="text/javascript">
+      function resetQuestion<%=poll_question.id%>()
+      {
+          $("#poll_questions_title_<%=poll_question.id%>").val("<%= poll_question.question_title%>")
+          $("#is_necessary_<%=poll_question.id%>").replaceWith("<input type='checkbox' name='is_necessary' id='is_necessary_<%=poll_question.id%>' value='true' <%= poll_question.is_necessary == 1 ? 'checked' : ''%>/>");
+          $("#poll_answers_<%=poll_question.id%>").html("<% poll_question.poll_answers.reorder('answer_position').each do |poll_answer| %>" +
+              "<li class='ur_item'>" +
+              "<label>选项<span class='ur_index'></span>：</label>" +
+              "<input type='text'  maxlength='200' name='question_answer[<%= poll_answer.id %>]' placeholder='新建选项' value='<%= poll_answer.answer_text%>'/>" +
+              "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
+              "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
+              "</li>" +
+              "<div class='cl'></div>" +
+            "<% end%>");
+      }
+    </script>
+
     <div class="ur_editor radio">
       <div class="ur_editor_title">
         <label>问题：&nbsp;&nbsp;</label>
         <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
         <input  maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入单选题标题" value="<%= poll_question.question_title%>"/>
-        <input type="checkbox" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
+        <input type="checkbox" name="is_necessary" id="is_necessary_<%=poll_question.id%>" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
         <label>必答</label>
       </div>
       <div class="ur_editor_content">
-        <ul>
+        <ul id="poll_answers_<%=poll_question.id%>">
           <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %>
               <li class='ur_item'>
                 <label>选项<span class='ur_index'></span>：</label>
@@ -23,7 +40,7 @@
       </div>
       <div class="ur_editor_footer">
         <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
-        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="pollQuestionCancel(<%= poll_question.id%>);">取消</a>
+        <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">取消</a>
       </div>
       <div class="cl"></div>
     </div>
diff --git a/app/views/poll/_edit_MCQ.html.erb b/app/views/poll/_edit_MCQ.html.erb
index 5e267b03e..613fed371 100644
--- a/app/views/poll/_edit_MCQ.html.erb
+++ b/app/views/poll/_edit_MCQ.html.erb
@@ -1,13 +1,29 @@
 <%= form_for("",:url => update_poll_question_poll_index_path(:poll_question => poll_question.id),:remote => true) do |f|%><!--编辑多选start-->
+    <script type="text/javascript">
+        function resetQuestion<%=poll_question.id%>()
+        {
+            $("#poll_questions_title_<%=poll_question.id%>").val("<%= poll_question.question_title%>")
+            $("#is_necessary_<%=poll_question.id%>").replaceWith("<input type='checkbox' name='is_necessary' id='is_necessary_<%=poll_question.id%>' value='true' <%= poll_question.is_necessary == 1 ? 'checked' : ''%>/>");
+            $("#poll_answers_<%=poll_question.id%>").html("<% poll_question.poll_answers.reorder('answer_position').each do |poll_answer| %>" +
+                    "<li class='ur_item'>" +
+                    "<label>选项<span class='ur_index'></span>：</label>" +
+                    "<input type='text'  maxlength='200' name='question_answer[<%= poll_answer.id %>]' placeholder='新建选项' value='<%= poll_answer.answer_text%>'/>" +
+                    "<a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>" +
+                    "<a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>" +
+                    "</li>" +
+                    "<div class='cl'></div>" +
+                    "<% end%>");
+        }
+    </script>
   <div class="ur_editor checkbox">
     <div class="ur_editor_title">
       <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
       <input  maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入单选题标题" value="<%= poll_question.question_title%>"/>
-      <input type="checkbox" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
+      <input type="checkbox" name="is_necessary" id="is_necessary_<%=poll_question.id%>" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
       <label>必答</label>
     </div>
     <div class="ur_editor_content">
-      <ul>
+      <ul id="poll_answers_<%=poll_question.id%>">
         <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %>
             <li class='ur_item'>
               <label>选项<span class='ur_index'></span>：</label>
@@ -21,7 +37,7 @@
     </div>
     <div class="ur_editor_footer">
       <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
-      <a class="btn btn_light btn_cancel" data-button="cancel" onclick="pollQuestionCancel(<%= poll_question.id%>);">取消</a>
+      <a class="btn btn_light btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">取消</a>
     </div>
     <div class="cl"></div>
   </div><!--编辑多选 end-->
diff --git a/app/views/poll/_edit_mulit.html.erb b/app/views/poll/_edit_mulit.html.erb
index 99cd8afff..d498169f4 100644
--- a/app/views/poll/_edit_mulit.html.erb
+++ b/app/views/poll/_edit_mulit.html.erb
@@ -1,10 +1,17 @@
 <%= form_for("",:url => update_poll_question_poll_index_path(:poll_question => poll_question.id),:remote => true) do |f|%>
+<script type="text/javascript">
+    function resetQuestion<%=poll_question.id%>()
+    {
+        $("#poll_questions_title_<%=poll_question.id%>").val("<%= poll_question.question_title%>")
+        $("#is_necessary_<%=poll_question.id%>").replaceWith("<input type='checkbox' name='is_necessary' id='is_necessary_<%=poll_question.id%>' value='true' <%= poll_question.is_necessary == 1 ? 'checked' : ''%>/>");
+    }
+</script>
 <div class="ur_editor textarea"> <!--编辑多行文字start-->
   <div class="ur_editor_title">
     <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
     <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
     <input  maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入多行主观标题" value="<%= poll_question.question_title%>"/>
-    <input type="checkbox" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
+    <input type="checkbox" id="is_necessary_<%=poll_question.id%>" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
     <label for="ur_question_require">必答</label>
   </div>
   <div class="ur_editor_toolbar">
@@ -14,7 +21,7 @@
   </div>
   <div class="ur_editor_footer">
     <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
-    <a class="btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().remove();">取消</a>
+    <a class="btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">取消</a>
   </div>
   <div class="cl"></div>
 </div><!--编辑多行文字end-->
diff --git a/app/views/poll/_edit_single.html.erb b/app/views/poll/_edit_single.html.erb
index 926000c90..2c2d41e0f 100644
--- a/app/views/poll/_edit_single.html.erb
+++ b/app/views/poll/_edit_single.html.erb
@@ -1,16 +1,23 @@
 <%= form_for("",:url => update_poll_question_poll_index_path(:poll_question => poll_question.id),:remote => true) do |f|%>
+<script type="text/javascript">
+    function resetQuestion<%=poll_question.id%>()
+    {
+        $("#poll_questions_title_<%=poll_question.id%>").val("<%= poll_question.question_title%>")
+        $("#is_necessary_<%=poll_question.id%>").replaceWith("<input type='checkbox' name='is_necessary' id='is_necessary_<%=poll_question.id%>' value='true' <%= poll_question.is_necessary == 1 ? 'checked' : ''%>/>");
+    }
+</script>
 <div class="ur_editor text "> <!--编辑单行文字start-->
   <div class="ur_editor_title">
     <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
     <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
     <input  maxlength="250" id="poll_questions_title_<%=poll_question.id%>" class="ur_question_title" contenteditable="true" type="text"
            name="poll_questions_title"  placeholder="请输入单行主观标题" value="<%= poll_question.question_title%>"/>
-    <input type="checkbox" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
+    <input type="checkbox" id="is_necessary_<%=poll_question.id%>" name="is_necessary" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
     <label for="ur_question_require">必答</label>
   </div>
   <div class="ur_editor_footer">
     <a class="btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().submit();">确定</a>
-    <a class="btn_cancel" data-button="cancel" onclick="pollQuestionCancel(<%= poll_question.id%>);">取消</a>
+    <a class="btn_cancel" data-button="cancel" onclick="resetQuestion<%=poll_question.id%>();pollQuestionCancel(<%= poll_question.id%>);">取消</a>
   </div>
   <div class="cl"></div>
 </div><!--编辑单行文字end-->

From bba213dec9505c52cf658d4dc48957725611da9b Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 17 Jan 2015 12:12:06 +0800
Subject: [PATCH 3/4] =?UTF-8?q?1.#1802=20=E4=BF=AE=E5=A4=8D=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=8B=E6=96=B9=E6=9C=89=E5=BE=88=E5=A4=A7=E4=B8=80?=
 =?UTF-8?q?=E7=89=87=E7=A9=BA=E7=99=BD=202.=E4=BF=AE=E5=A4=8D=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=96=87=E6=9C=AC=E6=A1=86=E7=9A=84padding=E3=80=81ma?=
 =?UTF-8?q?rgin=E9=83=BD=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_feedback.html.erb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb
index 859ed0361..87a30346e 100644
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@@ -60,18 +60,18 @@ function f_submit()
 </script>
 
 <style type="text/css">
-/*浮窗*/ 
-body{ height:3000px; font-family:'微软雅黑';} 
-div,ul,li,body,h3,p{margin:0; padding:0;} 
+/*浮窗*/
+/*body{ height:3000px; font-family:'微软雅黑';}*/
+/*div,ul,li,body,h3,p{margin:0; padding:0;}*/
 a{ text-decoration:none;}
 #roll{ background:url(/images/f_opnion.jpg) 0 0 no-repeat;width:157px; height:332px; position:absolute;}
-.opnionBox{ width: 130px; height:146px; margin:76px auto 20px; } 
+.opnionBox{ width: 130px; height:146px; margin:76px auto 20px; }
 .opnionText{  width: 120px !important; height:130px; outline:none; border:none !important;padding: 0 5px !important; color: #03a8bb;line-height:1.5; font-size:12px; }
 a.opnionButton{  width:40px; height:20px; display:block;  margin:0 auto;font-size:14px; color:#fd6e2a; font-weight: bold;    }
 a:hover.opnionButton{ text-decoration:underline;}
 .opnionCall{ color:#03a8bb; font-size:12px;  width:105px;  margin:0 auto;}
 .opnionCall .tectitle{ font-size:14px; alignment-adjust: central; color:#03a8bb; margin-bottom:8px,}
-/*提示框*/ 
+/*提示框*/
 .ui-mask{background-color:#000;opacity:0.5;filter:alpha(opacity=50);width:100%;height:100%;position:fixed;_position:absolute;left:0;top:0;z-index:9999998;display:none;}
 .change_success{
 	display:block;
@@ -100,11 +100,11 @@ a:hover.opnionButton{ text-decoration:underline;}
 	
 	<% get_memo %>
 		<%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
-	<div class="actions" style="max-width:680px">
-		<p>
+	    <div class="actions" style="max-width:680px;">
+		<p style="margin:0; padding:0;">
           <%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%>
         </p>
-        <p>
+        <p style="margin:0; padding:0;">
           <%= f.hidden_field :content, :required => true ,:value=>'该贴来自用户反馈！'%>
         </p>
 		  <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %>
@@ -119,7 +119,7 @@ a:hover.opnionButton{ text-decoration:underline;}
 
 <div class="opnionCall">
 	<div class="tectitle">技术支持：</div>
-    <p ><%= l(:label_course_adcolick) %><a href="http://user.trustie.net/users/12/user_newfeedback">黄井泉</a><br>
+    <p style="margin:0; padding:0;" ><%= l(:label_course_adcolick) %><a href="http://user.trustie.net/users/12/user_newfeedback">黄井泉</a><br>
     	<%= l(:label_course_adcolick) %><a href="http://user.trustie.net/users/34/user_newfeedback">白羽</a></p>
 </div>
 

From b3f37f515411b2f8876ec598f2f7eb055227b460 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 17 Jan 2015 12:13:03 +0800
Subject: [PATCH 4/4] 111

---
 app/views/layouts/_base_feedback.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb
index 87a30346e..52006e94d 100644
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@@ -63,7 +63,7 @@ function f_submit()
 /*浮窗*/
 /*body{ height:3000px; font-family:'微软雅黑';}*/
 /*div,ul,li,body,h3,p{margin:0; padding:0;}*/
-a{ text-decoration:none;}
+    #roll a{ text-decoration:none;}
 #roll{ background:url(/images/f_opnion.jpg) 0 0 no-repeat;width:157px; height:332px; position:absolute;}
 .opnionBox{ width: 130px; height:146px; margin:76px auto 20px; }
 .opnionText{  width: 120px !important; height:130px; outline:none; border:none !important;padding: 0 5px !important; color: #03a8bb;line-height:1.5; font-size:12px; }