jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改了普通用户拥有修改自己个人资料的权限 

主页footer颜色去掉
This commit is contained in:
huangjingquan 2013-08-10 09:57:43 +08:00
parent 38c6a187e4
commit 1abba1c48b
5 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/users_controller.rb
View File

@ -17,8 +17,9 @@
class UsersController < ApplicationController class UsersController < ApplicationController
layout 'base_users' 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 :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] 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 accept_api_auth :index, :show, :create, :update, :destroy
#william #william

2
app/views/layouts/base_users.html.erb
View File

@ -40,7 +40,7 @@
<% unless User.current == @user %> <% unless User.current == @user %>
<%= watcher_link(@user, User.current) %> <%= watcher_link(@user, User.current) %>
<% else %> <% 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> </tr>
</table></td> </table></td>
</tr> </tr>

BIN
public/images/sidebar/tool_tag2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

10
public/stylesheets/application.css
View File

@ -11,16 +11,6 @@ h4 {border-bottom: 1px dotted #bbb;}
/*new by huang*/ /*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; ul.list_watch{list-style-type:none;
height:auto; height:auto;
border-bottom: 1px dashed rgb(204, 204, 204); border-bottom: 1px dashed rgb(204, 204, 204);

3
public/themes/redpenny-master/stylesheets/application.css
View File

@ -376,12 +376,13 @@ ul.projects li.root
#top-menu ul #top-menu ul
{ {
padding:0 1px /*控制顶层导航宽度*/ padding:0px 1px /*控制顶层导航宽度*/
} }
#top-menu li,#top-menu #loggedas #top-menu li,#top-menu #loggedas
{ {
/*by young*/ /*by young*/
padding-top: 4px;
color:#fff; color:#fff;
line-height:21px; line-height:21px;
margin-right:4px margin-right:4px