From 1abba1c48b688fd62750bf314a00989b154ba1c1 Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Sat, 10 Aug 2013 09:57:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=99=AE=E9=80=9A?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=8B=A5=E6=9C=89=E4=BF=AE=E6=94=B9=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E4=B8=AA=E4=BA=BA=E8=B5=84=E6=96=99=E7=9A=84=E6=9D=83?= =?UTF-8?q?=E9=99=90=20=E4=B8=BB=E9=A1=B5footer=E9=A2=9C=E8=89=B2=E5=8E=BB?= =?UTF-8?q?=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 5 +++-- app/views/layouts/base_users.html.erb | 2 +- public/images/sidebar/tool_tag2.png | Bin 0 -> 3593 bytes public/stylesheets/application.css | 10 ---------- .../redpenny-master/stylesheets/application.css | 3 ++- 5 files changed, 6 insertions(+), 14 deletions(-) create mode 100644 public/images/sidebar/tool_tag2.png diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6ac7d3a31..ae8cb9870 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -17,8 +17,9 @@ class UsersController < ApplicationController layout 'base_users' - before_filter :require_admin, :except => [:show, :index,:tag_save, :user_projects, :user_newfeedback, :user_comments, :watch_bids, :info, :user_watchlist, :user_fanslist] - before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments, :watch_bids, :info] + before_filter :require_admin, :except => [:show, :index,:tag_save, :user_projects, :user_newfeedback, :user_comments, :watch_bids, :info, :user_watchlist, :user_fanslist,:edit] + before_filter :find_user, :only => [:user_fanslist, :user_watchlist, :show, :edit, :update, :destroy, :edit_membership, + :destroy_membership, :user_activities, :user_projects, :user_newfeedback, :user_comments, :watch_bids, :info] accept_api_auth :index, :show, :create, :update, :destroy #william diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 8aa4e5803..23927392f 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -40,7 +40,7 @@ <% unless User.current == @user %> <%= watcher_link(@user, User.current) %> <% else %> - <%= link_to(l(:label_user_edit), edit_user_path(@user)) if User.current.admin? %><% end %> + <%= link_to(l(:label_user_edit), edit_user_path(@user)) if User.current %><% end %> diff --git a/public/images/sidebar/tool_tag2.png b/public/images/sidebar/tool_tag2.png new file mode 100644 index 0000000000000000000000000000000000000000..3c14e5ebbc1e7e38ca46ccb43191592516466b27 GIT binary patch literal 3593 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