From c041de02a7d88b94b41822d20045c413c058f061 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 29 Oct 2019 11:20:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E4=B8=AA=E4=BA=BA=E4=B8=BB?= =?UTF-8?q?=E9=A1=B5=E5=92=8C=E2=80=9CTA=E7=9A=84=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E2=80=9D=E7=9A=84=E5=B7=A6=E4=BE=A7=E5=A4=B4=E5=83=8F=E5=92=8C?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_show_left.html.erb | 17 ++++- public/stylesheets/css/common.css | 1 + .../stylesheets/css/iconfont/demo_index.html | 69 ++++++++++++++++++ public/stylesheets/css/iconfont/iconfont.css | 24 ++++-- public/stylesheets/css/iconfont/iconfont.eot | Bin 68136 -> 68744 bytes public/stylesheets/css/iconfont/iconfont.js | 3 +- public/stylesheets/css/iconfont/iconfont.json | 21 ++++++ public/stylesheets/css/iconfont/iconfont.svg | 9 +++ public/stylesheets/css/iconfont/iconfont.ttf | Bin 67968 -> 68576 bytes public/stylesheets/css/iconfont/iconfont.woff | Bin 43840 -> 44200 bytes .../stylesheets/css/iconfont/iconfont.woff2 | Bin 36936 -> 37228 bytes public/stylesheets/css/structure.css | 55 ++++++++++++++ 12 files changed, 187 insertions(+), 12 deletions(-) diff --git a/app/views/users/_user_show_left.html.erb b/app/views/users/_user_show_left.html.erb index 1c5917d47..a2b2b5329 100644 --- a/app/views/users/_user_show_left.html.erb +++ b/app/views/users/_user_show_left.html.erb @@ -6,15 +6,24 @@ <% else %> <%=image_tag(url_to_avatar(@user),width:"238", height: "238", :id=>'nh_source_tx') %> <% end %> + <% if @user.user_extensions && @user.user_extensions.identity %> +

<%= get_user_roll @user %>

+ <% end%>

<%= link_to @user.show_name, user_path(@user), :class => "f22 color-grey3" %>

-

- <% if @user.user_extensions && @user.user_extensions.identity %> - <%= get_user_roll @user %> - <% end%> +

+ <%= @user == User.current ? "个人" : "ta的" %>主页

+<% if @user != User.current %> +
+ 私信 + + 取消关注 +
+<% end %> + <% if @user == User.current %>