From d942cc31233227cd6839dc5ed62b0ce295a7cf32 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Fri, 21 Aug 2015 15:40:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=A7=E5=88=AB=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/new_base_user.html.erb | 11 +++++++---- public/stylesheets/new_public.css | 3 ++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index f0c9bcad1..5a2a7ac6b 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -18,6 +18,7 @@
+ <% is_current_user = User.current.logged? && User.current == @user%> <% if User.current.logged? %> <%= render :partial => 'layouts/logined_header' %> <% else%> @@ -32,7 +33,7 @@
<%= image_tag(url_to_avatar(@user),width:"206", height: "206", :id=>'nh_user_tx') %> <% if User.current.logged?%> - <% if User.current == @user%> + <% if is_current_user%>
@@ -49,8 +50,10 @@ -
- <%= link_to "编辑资料", my_account_path, :class => "fr gz_btn mr10"%> + <% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %> +
+ <% end %> + <%= link_to("编辑资料", my_account_path, :class => "fr gz_btn mr10") if is_current_user%>
@@ -63,7 +66,7 @@

<% else%> - <% if User.current == @user%> + <% if is_current_user%>

这位童鞋很懒，什么也没有留下～  diff --git a/public/stylesheets/new_public.css b/public/stylesheets/new_public.css index 9bcfc4dc0..869cfe4e6 100644 --- a/public/stylesheets/new_public.css +++ b/public/stylesheets/new_public.css @@ -410,7 +410,8 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no- .homepageEditProfile {width:20px; height:20px; border-radius:2px; background-color:#888888; position:absolute; right:9px; bottom:9px; font-size:12px; filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5;} .homepageEditProfileIcon {background:url(../images/homepage_icon.png) -11px -35px no-repeat; width:20px; height:20px; display:block;} .homepageImageName {font-size:16px; color:#484848; margin-left:15px; height:21px; float:left;max-width: 100px;} -.homepageImageSex {width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;} +.homepageImageSexMan {width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;} +.homepageImageSexWomen {width: 20px;height: 20px;background: url(../images/homepage_icon.png) -10px -149px no-repeat;float: left;} .homepageSignature {font-size:12px; color:#888888; margin-left:15px; margin-top:10px; margin-bottom:12px; width:208px;} .homepageImageBlock {margin:0 auto; width:78px; float:left; text-align:center; display:inline-block;} .homepageImageNumber {font-size:12px; color:#484848;}