From b61d76d94e1f1a7c37e0e36cb947b82da2620ae7 Mon Sep 17 00:00:00 2001
From: whimlex <whimlex@hotmail.com>
Date: Thu, 23 Apr 2015 18:18:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_base_feedback.html.erb | 23 +++++++++++------------
 app/views/layouts/_new_feedback.html.erb  |  4 ++--
 config/locales/commons/zh.yml             |  2 +-
 public/javascripts/feedback.js            |  6 +++---
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb
index 62312932d..fb5e8f2ab 100644
--- a/app/views/layouts/_base_feedback.html.erb
+++ b/app/views/layouts/_base_feedback.html.erb
@@ -88,9 +88,9 @@ $(function(){
 
 function f_submit()
 {
-    var subject = $("#memo_subject").val();
-    var content = $("#memo_content_1").val();
-    $("#memo_subject").val(subject+"："+ content.substr(0,18)+"...");
+//    var subject = $("#memo_subject").val();
+//    var content = $("#memo_content_1").val();
+//    $("#memo_subject").val(subject+"："+ content.substr(0,18)+"...");
     $("#new_memo").submit();
 }
 
@@ -139,15 +139,14 @@ function cookieget(n)
     });
 
     $(document).ready(function(){
-        $("#memo_content_1").keydown(function(){
-            var curLength=$("#memo_content_1").val().length;
+        $("#subject").keydown(function(){
+            var curLength=$("#subject").val().length;
             if(curLength>=50){
-                var num=$("#memo_content_1").val().substr(0,49);
-                $("#memo_content_1").val(num);
-                alert("超过意见反馈内容字数限制，多出的内容将被截断！" );
+                var num=$("#subject").val().substr(0,49);
+                $("#subject").val(num);
             }
             else{
-                $("#textCount").text(49-$("#memo_content_1").val().length)
+                $("#textCount").text(49-$("#subject").val().length)
             }
         })
     })
@@ -160,10 +159,10 @@ function cookieget(n)
                 <div class="custom_service">
                   <% get_memo %>
 				  <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
-                    <%= f.hidden_field :subject,:required => true , :value => l(:label_feedback_value) %>
-          			<%= f.text_area :content,:class => "opnionText",:id=>"memo_content_1" ,:placeholder => l(:label_feedback_tips)   %>
+                      <%= f.text_area :subject,:id=>"subject", :class => "opnionText", :placeholder => l(:label_feedback_tips) %>
+                      <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
 		  			 <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %>
-                      <label><span id="textCount">50</span>/50</label>
+                      <label class="c_grey">您还能输入<span id="textCount" class="c_orange">50</span>个字符</label>
                       <a href="javascript:void(0);" class="opnionButton" style=" color:#fff;" id="" onclick="f_submit();"><%= l(:label_submit)%></a>
 				  <% end %>
                 </div>
diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb
index e30181612..34dc96491 100644
--- a/app/views/layouts/_new_feedback.html.erb
+++ b/app/views/layouts/_new_feedback.html.erb
@@ -13,8 +13,8 @@
         <div class="custom_service">
           <% get_memo %>
           <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
-              <%= f.hidden_field :subject,:required => true , :value => l(:label_feedback_value) %>
-              <%= f.text_area :content,:class => "opnionText" , :placeholder => l(:label_feedback_tips)  %>
+              <%= f.text_area :subject, :class => "opnionText", :placeholder => l(:label_feedback_tips) %>
+              <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
               <a href="javascript:void(0);" class="opnionButton" style=" color:#fff;" id="" onclick="f_submit();">
                 <%= l(:label_submit)%>
               </a>
diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml
index 366841e37..1703ac193 100644
--- a/config/locales/commons/zh.yml
+++ b/config/locales/commons/zh.yml
@@ -354,7 +354,7 @@ zh:
   label_feedback_tips: "有什么想说的，尽管来咆哮吧~~"
   label_technical_support: "技术支持："
   label_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！"
-  label_feedback_value: "用户反馈"
+  label_feedback_value: "该帖来自用户反馈:)"
   
 
 
diff --git a/public/javascripts/feedback.js b/public/javascripts/feedback.js
index c55cfd5c3..eab86bf20 100644
--- a/public/javascripts/feedback.js
+++ b/public/javascripts/feedback.js
@@ -54,9 +54,9 @@ $(function(){
 
 function f_submit()
 {
-    var subject = $("#memo_subject").val();
-    var content = $("#memo_content").val();
-    $("#memo_subject").val(subject+"："+ content.substr(0,18)+"...");
+//    var subject = $("#memo_subject").val();
+//    var content = $("#memo_content").val();
+//    $("#memo_subject").val(subject+"："+ content.substr(0,18)+"...");
     $("#new_memo").submit();
 }