From a53b9f9049fa3c5edd68cf99d05970e2a3d355a7 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 26 Aug 2015 15:49:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=99=E8=A8=80=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb       |  2 +-
 app/views/layouts/new_base_user.html.erb  |  3 ++-
 app/views/users/user_newfeedback.html.erb | 31 ++++++++++++++++-------
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ceeb3a201..c1815b6c4 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -346,7 +346,7 @@ class UsersController < ApplicationController
     end
     @jour = paginateHelper jours,10
     @state = false
-    render :layout=>'base_users_new'
+    render :layout=>'new_base_user'
   end
 
   def user_comments
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 315960a4c..febf08799 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -114,7 +114,8 @@
           </ul>
         </div>
         <div class="homepageLeftMenuBlock">
-          <a href="javascript:void(0);" class="homepageMenuText">留言</a>
+          <!--<a href="javascript:void(0);" class="homepageMenuText">留言</a>-->
+          <%= link_to '留言',feedback_path(@user),:class=>'homepageMenuText'%>
         </div>
       </div>
       <div class="homepageLeftLabelContainer">
diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb
index a8107ce5f..d04979b10 100644
--- a/app/views/users/user_newfeedback.html.erb
+++ b/app/views/users/user_newfeedback.html.erb
@@ -1,13 +1,26 @@
-<div class="top_new">
-  <span class="<%= (@user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true)) ? 'top_new_bg' : 'top_newcourses_bg'%> fl"></span>
-  <% if @user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true) %>
-      <a href="<%= url_for(:controller => 'courses', :action => 'new',) %>" class="green_n_btn fr mt2" target="_blank">新建课程</a>
-  <% end %>
-  <div class="cl"></div>
-</div>
+<!--<div class="top_new">-->
+  <!--<span class="<%#= (@user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true)) ? 'top_new_bg' : 'top_newcourses_bg'%> fl"></span>-->
+  <!--<%# if @user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true) %>-->
+      <!--<a href="<%#= url_for(:controller => 'courses', :action => 'new',) %>" class="green_n_btn fr mt2" target="_blank">新建课程</a>-->
+  <!--<%# end %>-->
+  <!--<div class="cl"></div>-->
+<!--</div>-->
+<style type="text/css">
+    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
+    span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
+    span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
+    div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
+    span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
+    span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
+    div.ke-toolbar .ke-outline{border:none;}
 
+    div.respond-form .reply_btn{margin-left:565px;margin-top:5px;}
+    div.recall_con{width:570px;}
+    div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
+    .fr.cr{ clear: right}
+</style>
 <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"user" %>
-<div id="RSide" class="fl">
+<!--<div id="RSide" class="fl">-->
   <!--<div class="users_r_top">-->
     <!--<h2 class="users_r_h2">用户留言</h2>-->
   <!--</div>-->
@@ -37,4 +50,4 @@
     </div>
     <div class="cl"></div>
   </div><!--message_box end-->
-</div>
\ No newline at end of file
+<!--</div>-->
\ No newline at end of file