From 4c482e1facdd0ada4cd69a3d10911e975815e0f7 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 17 Mar 2015 16:19:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=96=B0=E7=9A=84=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=8F=8D=E9=A6=88=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_new_feedback.html.erb | 33 ++++++++++++++++--------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb
index ec113d413..4f7e650eb 100644
--- a/app/views/layouts/_new_feedback.html.erb
+++ b/app/views/layouts/_new_feedback.html.erb
@@ -1,27 +1,38 @@
 <%= javascript_include_tag "feedback" %>
+
 <div class="scrollsidebar" id="scrollsidebar">
   <div class="side_content">
     <div class="side_list">
       <div class="side_title">
-        <a title="隐藏" class="close_btn"><span>关闭</span></a>
+        <a title="<%= l(:button_hide) %>" class="close_btn">
+          <span>
+          </span>
+        </a>
       </div>
       <div class="side_center">
         <div class="custom_service">
-          <form>
-            <textarea  class="opnionText" onfocus="if(this.value=='有什么想说的，尽管来咆哮吧~~')this.value=''" >有什么想说的，尽管来咆哮吧~~</textarea>
-          </form>
-          <a href="#" class="opnionButton c_white" id="button1">提&nbsp;&nbsp;交</a>
+          <% get_memo %>
+          <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f|  %>
+              <%= f.text_area :subject, :class => "opnionText", :placeholder => l(:label_feedback_tips) %>
+              <%= f.hidden_field :content, :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>
+          <% end %>
         </div>
-
         <div class="msgserver">
-          <p>
-            <a href="#" target="_blank">技术支持：黄井泉</a>
-            <a href="#" target="_blank">技术支持：白&nbsp;&nbsp;羽</a>
-          </p>
+          <a href="http://user.trustie.net/users/12/user_newfeedback" target="_blank">
+            <%= l(:label_technical_support) %>
+            黄井泉
+          </a>
+          <a href="http://user.trustie.net/users/34/user_newfeedback" target="_blank">
+            <%= l(:label_technical_support) %>
+            白&nbsp;&nbsp;&nbsp;羽
+          </a>
         </div>
       </div>
       <div class="side_bottom"></div>
     </div>
   </div>
   <div class="show_btn"><span>在线客服</span></div>
-</div>
\ No newline at end of file
+</div>