From 32122796f9f5888e562bd59abd2cbce1b4a78c21 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 30 Jul 2015 11:44:36 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=88=91=E7=9A=84=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E3=80=81=E6=88=91=E7=9A=84=E9=A1=B9=E7=9B=AE=E7=95=99=E8=A8=80?=
 =?UTF-8?q?js=E9=97=AE=E9=A2=98=202=E3=80=81=E7=BC=96=E8=BE=91=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E6=97=A0=E6=B3=95=E6=8F=90=E4=BA=A4=203=E3=80=81?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E4=BB=96=E4=BA=BA=E9=A1=B9=E7=9B=AE=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8A=A0=E5=85=A5=E9=A1=B9=E7=9B=AE=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_users_new.html.erb | 14 +++++++++++++-
 app/views/users/show.html.erb             |  2 +-
 app/views/users/user_newfeedback.html.erb |  2 +-
 app/views/users/user_projects.html.erb    |  2 --
 public/javascripts/user.js                | 10 ----------
 5 files changed, 15 insertions(+), 15 deletions(-)

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 @@
   </div><!--floatbox end-->
 </div>
 
+<script type="text/javascript">
+    $(function(){
+        if($(".top_new").length==0){
+            $("#RSide").css("min-height",$("#LSide").height()-30);
+        }
+        else{
+            $("#RSide").css("min-height",$("#LSide").height()-87);
+        }
+
+    });
+</script>
+
 </body>
 </html>
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 %>
 <div class="top_new">
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" %>
 <div id="RSide" class="fl">
   <div class="users_r_top">
     <h2 class="users_r_h2">用户留言</h2>
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 @@
   <span class="<%= (@user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true)) ? 'top_new_bg' : 'top_newcourses_bg'%> fl"></span>
   <% if @user.allowed_to?(:add_project, nil, :global => true) %>
     <a href="<%= url_for(:controller => 'projects', :action => 'new') %>" class="bgreen_n_btn fr ml10 mt2" target="_blank">新建项目</a>
-  <% else %>
-    <a href="<%= join_project_projects_path %>" data-remote ="true" class="green_n_btn fr mt2">加入项目</a>
   <% end %>
   <div class="cl"></div>
 </div>
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){