From f18c3ed6679d88e63314b700914e2f3d5e99e450 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Fri, 20 May 2016 13:37:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=81=E6=9C=89=E8=B5=84=E6=BA=90=E4=B8=AD?=
 =?UTF-8?q?=E4=B8=8D=E6=B7=BB=E5=8A=A0=E2=80=9D=E4=B8=8A=E4=BC=A0=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E2=80=9C=E7=9A=84=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_show_new_upload.html.erb    | 3 +++
 app/views/users/_user_resource_info.html.erb | 4 +++-
 app/views/users/user_resource.js.erb         | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 app/views/users/_show_new_upload.html.erb

diff --git a/app/views/users/_show_new_upload.html.erb b/app/views/users/_show_new_upload.html.erb
new file mode 100644
index 000000000..b343aeae1
--- /dev/null
+++ b/app/views/users/_show_new_upload.html.erb
@@ -0,0 +1,3 @@
+<% if @type != "2" %>
+    <div class="resourcesUploadBox mt10" ><a href="javascript:void(0);" onclick="show_upload();" class="uploadBoxIcon">上传资源</a></div>
+<% end %>
diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index 950dcd6f5..1e3cd508c 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -1,5 +1,7 @@
 <div id="users_setting">
-  <div class="resourcesUploadBox mt10"><a href="javascript:void(0);" onclick="show_upload();" class="uploadBoxIcon">上传资源</a></div>
+  <div id="upload_private_resource">
+     <%= render :partial => "show_new_upload", :locals => {:type => @type, :status => @status} %>
+  </div>
   <div id="search_div">
     <%= render :partial =>  'users/resource_search_form',:locals => {:user => @user, :type => @type, :order => @order, :sort => @score, :status => @status} %>
   </div>
diff --git a/app/views/users/user_resource.js.erb b/app/views/users/user_resource.js.erb
index 2fa0035b2..758b8c2f0 100644
--- a/app/views/users/user_resource.js.erb
+++ b/app/views/users/user_resource.js.erb
@@ -2,6 +2,7 @@ $("#search_div").html('<%= escape_javascript( render :partial => 'resource_searc
 $("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' , :locals => { :attachments => @attachments}) %>');
 $("#user_resource_type_filter").html('<%= escape_javascript( render :partial => 'user_resource_type_filter' , :locals => {:user => @user, :type => @type, :status => @status}) %>');
+$("#upload_private_resource").html('<%= escape_javascript( render :partial => 'show_new_upload' , :locals => {:user => @user, :type => @type, :status => @status}) %>');
 $("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);