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 %>  -<% else%> - 这位童鞋很懒,什么也没有留下~  -<% end %> + + <% if user.user_extensions && user.user_extensions.brief_introduction && !user.user_extensions.brief_introduction.empty? %> + <%= user.user_extensions.brief_introduction %> + <% else%> + 这位童鞋很懒,什么也没有留下~ + <% end %> + <% 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 @@
-

- <%= render :partial => 'layouts/user_brief_introduction', :locals => {:user => @user} %> -

+
+ <%= render :partial => 'layouts/user_brief_introduction', :locals => {:user => @user} %> +
@@ -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");