From 980b852c17437704d3492f91c5d4c0e260e2b889 Mon Sep 17 00:00:00 2001 From: zhangyang Date: Thu, 1 Aug 2013 19:38:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A1=86=E6=9E=B6=E7=9A=84?= =?UTF-8?q?=E5=BA=95=E9=83=A8=EF=BC=9B=E4=BF=AE=E6=94=B9=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E4=B8=AD=E5=9B=9E=E5=A4=8D=E6=96=87=E5=AD=97=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=95=88=E6=9E=9C=EF=BC=9B=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=AD=89=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 2 +- app/views/layouts/_base_footer.html.erb | 5 +++++ app/views/users/show.html.erb | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 app/views/layouts/_base_footer.html.erb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 319608718..18d3e9abf 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -17,7 +17,7 @@ class UsersController < ApplicationController layout 'base_users' - before_filter :require_admin, :except => [:show, :index,:tag_save] + before_filter :require_admin, :except => [:show, :index,:tag_save, :user_projects, :user_newfeedback, :user_comments] before_filter :find_user, :only => [:show, :edit, :update, :destroy, :edit_membership, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments] accept_api_auth :index, :show, :create, :update, :destroy diff --git a/app/views/layouts/_base_footer.html.erb b/app/views/layouts/_base_footer.html.erb new file mode 100644 index 000000000..e90580d9f --- /dev/null +++ b/app/views/layouts/_base_footer.html.erb @@ -0,0 +1,5 @@ + \ No newline at end of file diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 8c58dd7f2..772c673d3 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -11,7 +11,7 @@ <%= content_tag('span', h(e.project), :class => 'project') %> 有了最新动态 <%= link_to format_activity_title(e.event_title), e.event_url %> -

<%= format_activity_description(e.event_description) %>

+

<%= textilizable e.event_description %>