diff --git a/app/views/projects/settings.html.erb b/app/views/projects/settings.html.erb index 4bef4d3ed..a399dad41 100644 --- a/app/views/projects/settings.html.erb +++ b/app/views/projects/settings.html.erb @@ -24,7 +24,6 @@
-
<%= render :partial=>"projects/settings/new_edit" if User.current.allowed_to?(:edit_project, @project)%>
@@ -52,7 +51,6 @@
<%= render :partial=>"projects/settings/new_repositories" if User.current.allowed_to?(:manage_repository, @project)%>
-
@@ -78,8 +76,18 @@ }); var windowH = $(window).height(); var contentH = $(".pro_new_setting_conbox").height(); - if(windowH >795.5) { + if(windowH > contentH + 329) { $(".pro_new_setting_conbox").css("margin-bottom",windowH - 329 -contentH + "px"); + }else{ + $(".pro_new_setting_conbox").css("margin-bottom",0); } + $(".pro_new_setting_leftnav ul li").live("click",function(){ + var newContentH = $(".pro_new_setting_conbox").height(); + if(windowH > newContentH + 329) { + $(".pro_new_setting_conbox").css("margin-bottom",windowH - 329 - newContentH + "px"); + }else{ + $(".pro_new_setting_conbox").css("margin-bottom",0); + } + });