diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb index 70106e4a3..4f0552bb5 100644 --- a/app/views/layouts/base_users_new.html.erb +++ b/app/views/layouts/base_users_new.html.erb @@ -17,7 +17,7 @@ <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'public_new', 'leftside_new','users', :media => 'all' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= javascript_heads %> -<%= javascript_include_tag "user","avatars"%> +<%= javascript_include_tag "avatars"%> <%= heads_for_theme %> <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> @@ -318,5 +318,17 @@ + + diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 66482211c..2a9e96432 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,4 +1,4 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"user" %> <% @center_flag = (User.current == @user) %> <% if @center_flag %>
diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb index f9573f65e..91c049f7a 100644 --- a/app/views/users/user_newfeedback.html.erb +++ b/app/views/users/user_newfeedback.html.erb @@ -1,4 +1,4 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"user" %>

用户留言

diff --git a/app/views/users/user_projects.html.erb b/app/views/users/user_projects.html.erb index 977945d7f..42e665388 100644 --- a/app/views/users/user_projects.html.erb +++ b/app/views/users/user_projects.html.erb @@ -2,8 +2,6 @@ <% if @user.allowed_to?(:add_project, nil, :global => true) %> 新建项目 - <% else %> - 加入项目 <% end %>
diff --git a/public/javascripts/user.js b/public/javascripts/user.js index e760361b9..5cf18590a 100644 --- a/public/javascripts/user.js +++ b/public/javascripts/user.js @@ -1,13 +1,3 @@ -$(function(){ - if($(".top_new").length==0){ - $("#RSide").css("min-height",$("#LSide").height()-30); - } - else{ - $("#RSide").css("min-height",$("#LSide").height()-87); - } - -}); - //个人动态 $(function(){ function init_editor(params){