parent
38c6a187e4
commit
1abba1c48b
|
@ -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
|
||||
|
|
|
@ -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 %></td>
|
||||
<%= link_to(l(:label_user_edit), edit_user_path(@user)) if User.current %><% end %></td>
|
||||
</tr>
|
||||
</table></td>
|
||||
</tr>
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 3.5 KiB |
|
@ -11,16 +11,6 @@ h4 {border-bottom: 1px dotted #bbb;}
|
|||
|
||||
/*new by huang*/
|
||||
/**/
|
||||
.footer_color{
|
||||
background-image: -moz-linear-gradient(top,#BBBBBB,#FFFFEC);
|
||||
background-image: -webkit-gradient(linear,0 0,0 100%,from(#ffffff),to(#15bccf));
|
||||
background-image: -webkit-linear-gradient(top,#ffffff,#15bccf);
|
||||
background-image: -o-linear-gradient(top,#ffffff,#15bccf);
|
||||
background-image: linear-gradient(to bottom,#ffffff,#15bccf);
|
||||
background-repeat: repeat-x;
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff222222',endColorstr='#ff111111',GradientType=0)
|
||||
}
|
||||
|
||||
ul.list_watch{list-style-type:none;
|
||||
height:auto;
|
||||
border-bottom: 1px dashed rgb(204, 204, 204);
|
||||
|
|
|
@ -376,12 +376,13 @@ ul.projects li.root
|
|||
|
||||
#top-menu ul
|
||||
{
|
||||
padding:0 1px /*控制顶层导航宽度*/
|
||||
padding:0px 1px /*控制顶层导航宽度*/
|
||||
}
|
||||
|
||||
#top-menu li,#top-menu #loggedas
|
||||
{
|
||||
/*by young*/
|
||||
padding-top: 4px;
|
||||
color:#fff;
|
||||
line-height:21px;
|
||||
margin-right:4px
|
||||
|
|
Loading…
Reference in New Issue