From 44c9265fee20616107f9a484e6e77ee253929eda Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Mon, 13 Jun 2016 15:29:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E4=B8=AA?=
 =?UTF-8?q?=E6=80=A7=E7=AD=BE=E5=90=8D=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=AF=86=E5=88=ABurl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layouts/_user_brief_introduction.html.erb      | 14 ++++++++------
 app/views/layouts/new_base_user.html.erb           |  7 ++++---
 app/views/users/edit_brief_introduction.js.erb     |  3 ++-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/views/layouts/_user_brief_introduction.html.erb b/app/views/layouts/_user_brief_introduction.html.erb
index 3b0500fed..4b2645129 100644
--- a/app/views/layouts/_user_brief_introduction.html.erb
+++ b/app/views/layouts/_user_brief_introduction.html.erb
@@ -1,8 +1,10 @@
-<% if user.user_extensions && user.user_extensions.brief_introduction && !user.user_extensions.brief_introduction.empty? %>
-    <%= user.user_extensions.brief_introduction %>&nbsp;
-<% else%>
-    这位童鞋很懒，什么也没有留下～&nbsp;
-<% end %>
+<span>
+    <% if user.user_extensions && user.user_extensions.brief_introduction && !user.user_extensions.brief_introduction.empty? %>
+        <%= user.user_extensions.brief_introduction %>
+    <% else%>
+        这位童鞋很懒，什么也没有留下～
+    <% end %>
+</span>
 <% if User.current == user%>
     <%= link_to image_tag("../images/signature_edit.png",width:"12px", height: "12px"), "javascript:void(0);", :onclick => "show_edit_user_introduction();"%>
-<% end%>
\ No newline at end of file
+<% end %>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index e43aa499f..d67b2d3f3 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -139,9 +139,9 @@
 
         <div>
           <div class="homepageSignature break_word">
-            <p id="user_brief_introduction_show">
-              <%= render :partial => 'layouts/user_brief_introduction', :locals => {:user => @user} %>
-            </p>
+            <div id="user_brief_introduction_show">
+                <%= render :partial => 'layouts/user_brief_introduction', :locals => {:user => @user} %>
+            </div>
           </div>
           <textarea class="homepageSignatureTextarea none" placeholder="请编辑签名" id="user_brief_introduction_edit" onblur="edit_user_introduction('<%= edit_brief_introduction_user_path(@user.id)%>');"><%= @user.user_extensions.brief_introduction %></textarea>
         </div>
@@ -349,6 +349,7 @@
     $(function(){
         $('#user_hide_course').hide();
         $('#user_hide_project').hide();
+        autoUrl("user_brief_introduction_show");
     });
 
     $("#courseMenu").mouseenter(function(){
diff --git a/app/views/users/edit_brief_introduction.js.erb b/app/views/users/edit_brief_introduction.js.erb
index c64482715..eeaec4e6d 100644
--- a/app/views/users/edit_brief_introduction.js.erb
+++ b/app/views/users/edit_brief_introduction.js.erb
@@ -1,3 +1,4 @@
 $("#user_brief_introduction_show").html("<%= escape_javascript render(:partial => "layouts/user_brief_introduction", :locals => {:user => @user}) %>");
 $("#user_brief_introduction_show").show();
-$("#user_brief_introduction_edit").hide();
\ No newline at end of file
+$("#user_brief_introduction_edit").hide();
+autoUrl("user_brief_introduction_show");