diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 544ed7bf5..e98220d26 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -46,7 +46,7 @@ class UsersController < ApplicationController
                                   :activity_score_index, :influence_score_index, :score_index,:show_new_score, :topic_new_score_index, :project_new_score_index,
                                   :activity_new_score_index, :influence_new_score_index, :score_new_index,:user_projects_index,:user_resource,
                                   :user_courses4show,:user_projects4show,:user_course_activities,:user_project_activities,:user_feedback4show,:user_visitorlist,:user_messages,:edit_brief_introduction,
-                                  :user_import_homeworks,:user_search_homeworks]
+                                  :user_import_homeworks,:user_search_homeworks,:user_import_resource]
   before_filter :auth_user_extension, only: :show
   #before_filter :rest_user_score, only: :show
   #before_filter :select_entry, only: :user_projects
@@ -378,6 +378,16 @@ class UsersController < ApplicationController
     end
   end
 
+  #用户从资源库导入资源到作业
+  def user_import_resource
+    user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
+    @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+                                        "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
+    respond_to do |format|
+      format.js
+    end
+  end
+
 
   include CoursesHelper
   def user_courses
diff --git a/app/views/users/_show_user_resource.html.erb b/app/views/users/_show_user_resource.html.erb
new file mode 100644
index 000000000..a27a51d65
--- /dev/null
+++ b/app/views/users/_show_user_resource.html.erb
@@ -0,0 +1,26 @@
+<div class="coursesChoosePopup" id="coursesChoosePopup">
+  <div>
+    <div class="sendText">资源库</div>
+  </div>
+
+  <div >
+    <form class="coursesSearchBox">
+      <input type="text" name="homework_name" placeholder="输入资源名称进行搜索" class="searchCoursesPopup" id="search_homework_name"/>
+      <a href="javascript:void(0);" class="searchIconPopup" onclick="search_homework_by_name('<%= user_search_homeworks_user_path(User.current.id)%>');"></a>
+    </form>
+  </div>
+  <%= form_tag(user_select_homework_users_path, :multipart => true,:remote => true,:name=>"select_homework_form",:id=>'select_homework_form') do %>
+      <div class="homeworkListForm mb10 " id="homework_list_form_show">
+        <%= render :partial => 'users/show_user_homework_form', :locals => {:user_homeworks => @user_homeworks}%>
+      </div>
+      <div>
+        <div class="courseSendSubmit">
+          <a href="javascript:void(0);" class="sendSourceText" onclick="$('#select_homework_form').submit();">确定</a>
+        </div>
+        <div class="courseSendCancel">
+          <a href="javascript:void(0);" class="sendSourceText" onclick="hideModal('#coursesChoosePopup')">取消</a>
+        </div>
+      </div>
+  <% end%>
+  <div class="cl"></div>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_user_homework_attachment.html.erb b/app/views/users/_user_homework_attachment.html.erb
index e184d4132..4f47cd7f2 100644
--- a/app/views/users/_user_homework_attachment.html.erb
+++ b/app/views/users/_user_homework_attachment.html.erb
@@ -47,7 +47,7 @@
 
 <div class="mt5 fl">
   <a href="javascript:void(0);" class="AnnexBtn fl mt3" onclick="$('#_file').click();">上传附件</a>
-  <!--<a href="javascript:void(0);" class="FilesBtn fl mr15 mt3">资源库</a>-->
+  <%= link_to "资源库", user_import_resource_user_path(User.current.id),:class => "FilesBtn fl mr15 mt3",:remote => true%>
 </div>
 
 <% content_for :header_tags do %>
diff --git a/app/views/users/user_import_homeworks.js.erb b/app/views/users/user_import_homeworks.js.erb
index 7f9bfa0df..d00886b1c 100644
--- a/app/views/users/user_import_homeworks.js.erb
+++ b/app/views/users/user_import_homeworks.js.erb
@@ -4,4 +4,4 @@ $('#ajax-modal').css('height','300px').css("width","580px");
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
 "<a href='javascript:void(0)' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-$('#ajax-modal').parent().css("top","20%").css("left","25%");
+$('#ajax-modal').parent().css("top","20%").css("left","25%").css("position","fixed");
diff --git a/app/views/users/user_import_resource.js.erb b/app/views/users/user_import_resource.js.erb
new file mode 100644
index 000000000..ce70d68ad
--- /dev/null
+++ b/app/views/users/user_import_resource.js.erb
@@ -0,0 +1,7 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_homeworks') %>');
+showModal('ajax-modal', '580px');
+$('#ajax-modal').css('height','300px').css("width","580px");
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
+"<a href='javascript:void(0)' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().css("top","20%").css("left","25%").css("position","fixed");
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 634fb6d27..7237787bd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -329,6 +329,7 @@ RedmineApp::Application.routes.draw do
       match 'user_homeworks', :to => 'users#user_homeworks', :via => :get
       get 'user_import_homeworks'
       get 'user_search_homeworks'
+      get 'user_import_resource'
       match 'watch_projects', :to => 'users#watch_projects', :via => :get
       #
       # added by bai