diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb index 41bcdf4c4..859c0a81e 100644 --- a/app/views/blog_comments/show.html.erb +++ b/app/views/blog_comments/show.html.erb @@ -59,23 +59,23 @@ :class => 'postOptionLink' ) if User.current.admin? || User.current.id == @article.author.id %> -
  • - <% if @article.id == @article.blog.homepage_id %> - <%= link_to( - l(:button_cancel_homepage), - {:controller => 'blogs',:action => 'cancel_homepage',:user_id=>@article.author_id,:id=>@article.blog_id, :article_id => @article.id}, - :method => :post, - :class => 'postOptionLink' + + + <%#= link_to( +# l(:button_cancel_homepage), +# {:controller => 'blogs',:action => 'cancel_homepage',:user_id=>@article.author_id,:id=>@article.blog_id, :article_id => @article.id}, +# :method => :post, +# :class => 'postOptionLink' ) if User.current && User.current.id == @article.blog.author_id %> - <% else %> - <%= link_to( - l(:button_set_homepage), - {:controller => 'blogs',:action => 'set_homepage',:user_id=>@article.author_id,:id=>@article.blog_id, :article_id => @article.id}, - :method => :post, - :class => 'postOptionLink' + + <%#= link_to( +# l(:button_set_homepage), +# {:controller => 'blogs',:action => 'set_homepage',:user_id=>@article.author_id,:id=>@article.blog_id, :article_id => @article.id}, +# :method => :post, +# :class => 'postOptionLink' ) if User.current && User.current.id == @article.blog.author_id %> - <% end %> -
  • + + diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb index 620d68bec..1e2776eef 100644 --- a/app/views/blogs/_article.html.erb +++ b/app/views/blogs/_article.html.erb @@ -25,9 +25,9 @@ <% else %> <%= link_to activity.title.subject.to_s.html_safe, user_blog_blog_comment_path(:user_id=>activity.author_id, :blog_id=>activity.blog.id,:id=>activity), :class=> "list-title fl"%> <% end %> - <% if activity.blog.homepage_id and activity.id == activity.blog.homepage_id %> - [已设为首页] - <% end %> + <%# if activity.blog.homepage_id and activity.id == activity.blog.homepage_id %> + + <%# end %> <% if activity.sticky == 1 %> <% end%> diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index 4770bf408..eccae0059 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -93,9 +93,9 @@ <%# cache (act) do %> <% case user_activity.act_type.to_s %> <% when 'BlogComment' %> - <% if !(act.blog.homepage_id and act.id == act.blog.homepage_id) %> + <%# if !(act.blog.homepage_id and act.id == act.blog.homepage_id) %> <%= render :partial => 'user_blog', :locals => {:activity => act,:user_activity_id =>user_activity.id} %> - <% end %> + <%# end %> <% end %> <%# end %> <% end %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 530959e9b..4247e2c87 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -44,8 +44,8 @@ -<% if @user.blog.homepage_id and BlogComment.where("id=?", @user.blog.homepage_id).count > 0 %> - <% homepage = BlogComment.find(@user.blog.homepage_id) %> - <%= render :partial => 'blogs/homepage', :locals => {:activity => homepage, :user_activity_id => homepage.id} %> -<% end %> +<%# if @user.blog.homepage_id and BlogComment.where("id=?", @user.blog.homepage_id).count > 0 %> + <%# homepage = BlogComment.find(@user.blog.homepage_id) %> + <%#= render :partial => 'blogs/homepage', :locals => {:activity => homepage, :user_activity_id => homepage.id} %> +<%# end %> <%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0,:type => @type, :user_id => (@user.type == "AnonymousUser" ? User.current.id : @user.id)} %>