diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 0058e6e4c..a88068be7 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -381,14 +381,107 @@ class UsersController < ApplicationController
 
   #用户从资源库导入资源到作业
   def user_import_resource
-    user_course_ids = User.current.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
+    @user = User.current
+    user_course_ids = @user.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")
+    @type = params[:type]
+    @homework_id = params[:homework_id]
+    @limit = 7
+    @is_remote = true
+    @atta_count = @attachments.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @attachments = paginateHelper @attachments,7
     respond_to do |format|
       format.js
     end
   end
 
+  #引入资源列表根据类型过滤
+  def user_resource_type
+    if User.current.id.to_i != params[:id].to_i
+      render_403
+      return
+    end
+    if(params[:type].nil? || params[:type] == "1") #全部
+        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")
+    elsif params[:type] == "2" #课程资源
+        user_course_ids = User.current.courses.map { |c| c.id}
+        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) ").order("created_on desc")
+    elsif params[:type] == "3" #项目资源
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'").order("created_on desc")
+    elsif params[:type] == "4" #附件
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
+    elsif params[:type] == "5" #用户资源
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal'").order("created_on desc")
+    end
+    @type = params[:type]
+    @limit = 7
+    @is_remote = true
+    @atta_count = @attachments.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @attachments = paginateHelper @attachments,7
+    respond_to do |format|
+      format.js
+    end
+  end
+
+
+  #引入资源列表根据关键词过滤
+  def user_ref_resource_search
+    search = params[:search].to_s.strip.downcase
+    if(params[:type].nil? || params[:type] == "1") #全部
+        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(',')}))) and (filename like '%#{search}%') ").order("created_on desc")
+    elsif params[:type] == "2" #课程资源
+        user_course_ids = User.current.courses.map { |c| c.id}
+        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) and (filename like '%#{search}%') ").order("created_on desc")
+    elsif params[:type] == "3" #项目资源
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'  and (filename like '%#{search}%')").order("created_on desc")
+    elsif params[:type] == "4" #附件
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like '%#{search}%')").order("created_on desc")
+    elsif params[:type] == "5" #用户资源
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal' and (filename like '%#{search}%')").order("created_on desc")
+    end
+    @type = params[:type]
+    @limit = 7
+    @is_remote = true
+    @atta_count = @attachments.count
+    @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
+    @offset ||= @atta_pages.offset
+    #@curse_attachments_all = @all_attachments[@offset, @limit]
+    @attachments = paginateHelper @attachments,7
+    respond_to do |format|
+      format.js
+    end
+  end
+
+  #将资源批量引入
+  def import_resources_to_homework
+    @attachments = []
+      unless  params[:checkbox1].nil? || params[:checkbox1].blank?
+        params[:checkbox1].each do  |id|
+           atta = Attachment.find(id)
+           att_copy = atta.copy
+           att_copy.container_id = nil
+           att_copy.container_type = nil
+           att_copy.copy_from = atta.id
+           att_copy.save
+           @attachments << att_copy
+        end
+      end
+      respond_to do |format|
+        format.js
+      end
+  end
+
 
   include CoursesHelper
   def user_courses
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index b41b9f28f..387b38936 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -1,5 +1,8 @@
 
 <% if attachments.nil? || attachments.empty? %>
+        <p class="nodata">
+          <%= l(:label_no_data) %>
+        </p>
 <% else %>
     <% attachments.each do |attach| %>
     <ul class="resourcesList">
diff --git a/app/views/users/_show_user_resource.html.erb b/app/views/users/_show_user_resource.html.erb
index a27a51d65..a3c82d995 100644
--- a/app/views/users/_show_user_resource.html.erb
+++ b/app/views/users/_show_user_resource.html.erb
@@ -1,26 +1,67 @@
-<div class="coursesChoosePopup" id="coursesChoosePopup">
-  <div>
-    <div class="sendText">资源库</div>
-  </div>
+<script>
+//    $(document).ready(function(){
+////        var popupHeight = $(".referenceResourcesPopup").outerHeight(true);
+////        $(".referenceResourcesPopup").css("marginTop",-popupHeight/2);
+//
+//
+//        $(".resourcePopupClose").click(function(){
+//            $(".referenceResourcesPopup").css("display","none");
+//        });
+//    });
 
-  <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>
+    $(document).ready(function(){
+        $(".referenceTypeBlock").click(function(){
+            var activeBlock = $(".referenceResourceType").children(".referenceTypeActive");
+            activeBlock.removeClass("referenceTypeActive");
+            $(this).addClass("referenceTypeActive");
+        });
+    });
+</script>
+<!--<div class="referenceResourcesPopup">-->
+  <div>
+    <div class="referenceText">引用资源库资源</div>
+  </div>
+  <div>
+    <div class="referenceResourceType fl">
+      <a href="<%= user_resource_type_user_path(user)%>" class="referenceTypeBlock referenceTypeActive" data-remote="true" >资源库</a>
+      <a href="<%= user_resource_type_user_path(user,:type=>'2')%>" class="referenceTypeBlock"  data-remote="true">课程资源</a>
+      <a href="<%= user_resource_type_user_path(user,:type=>'3')%>" class="referenceTypeBlock"  data-remote="true">项目资源</a>
+      <a href="<%= user_resource_type_user_path(user,:type=>'5')%>" class="referenceTypeBlock"  data-remote="true">用户资源</a>
+      <a href="<%= user_resource_type_user_path(user,:type=>'4')%>" class="referenceTypeBlock"  data-remote="true">附件</a> </div>
+    <div class="fr">
+      <!--<form class="referenceSearchBox">-->
+      <%=  form_tag(user_ref_resource_search_user_path(user),:method => 'get',:remote=>'true',:class=>'referenceSearchBox') do%>
+        <input type="text" name="search" placeholder="输入资源关键词进行搜索" class="searchReferencePopup" />
+        <a href="javascript:void(0);" onclick="$(this).parent().submit();" class="referenceSearchIcon"></a>
+      <% end %>
+      <!--</form>-->
+    </div>
+    <div class="cl"></div>
+  </div>
+  <div class="resourcesListBanner">
+    <ul class="resourcesListTab">
+      <li class="resourcesListCheckbox fl"> </li>
+      <li class="resourcesListName fl">资源名称</li>
+      <li class="resourcesListSize fl">大小</li>
+      <li class="resourcesListType fl">类别</li>
+      <li class="resourcesListUploader fl">上传者</li>
+      <li class="resourcesListTime fl">上传时间</li>
+    </ul>
+  </div>
+  <%= form_tag(import_resources_to_homework_user_path(user),:method => 'post',:remote=>'true') do %>
+    <input type="hidden" name="homework_id" value="<%= homework_id%>"/>
+  <div style="height: 300px" id="user_ref_resources">
+    <%= render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments} %>
+  </div>
+  <div >
+    <ul class="wlist" id="resource_ref_pages" style="margin-top: 5px;">
+      <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
+    </ul>
+  </div>
+  <div>
+    <div class="courseSendSubmit"><a href="javascript:void(0);" onclick="$(this).parent().parent().parent().submit();" class="sendSourceText">确定</a></div>
+    <div class="courseSendCancel"><a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a></div>
   </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
+  <% end %>
+<!--</div>-->
diff --git a/app/views/users/_user_homework_attachment.html.erb b/app/views/users/_user_homework_attachment.html.erb
index 1613b144e..00d80dd22 100644
--- a/app/views/users/_user_homework_attachment.html.erb
+++ b/app/views/users/_user_homework_attachment.html.erb
@@ -46,8 +46,9 @@
 <div class="cl"></div>
 
 <div class="mt5 fl">
+   <!-- , user_import_resource_user_path(User.current.id,:homework_id=>container.id) -->
   <a href="javascript:void(0);" class="AnnexBtn fl mt3" onclick="$('#_file').click();">上传附件</a>
-  <%#= link_to "资源库", user_import_resource_user_path(User.current.id),:class => "FilesBtn fl mr15 mt3",:remote => true%>
+  <%= link_to "资源库",{:controller => 'users',:action=>'user_import_resource',:id=>User.current.id,:homework_id=>container.id},:class => "FilesBtn fl mr15 mt3",:remote => true%>
 </div>
 
 <% content_for :header_tags do %>
diff --git a/app/views/users/import_resources_to_homework.js.erb b/app/views/users/import_resources_to_homework.js.erb
new file mode 100644
index 000000000..b77590095
--- /dev/null
+++ b/app/views/users/import_resources_to_homework.js.erb
@@ -0,0 +1,16 @@
+<% unless @attachments.empty?%>
+    <% @attachments.each_with_index do |attachment, i| %>
+    $("#attachments_fields").append(
+    '<span id="attachments_p<%= i %>">'+
+    '<%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => "filename link_file", :readonly=>"readonly")%>'+
+    '<%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => "description", :style=>"display: inline-block;") %>'+
+        '<span class="ispublic-label"><%= l(:field_is_public)%>:</span>'+
+    '<%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => "is_public")%>'+
+    '<%= link_to("&nbsp;".html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => "js"), :method => "delete", :remote => true, :class => "remove-upload") unless attachment.id.nil? %>'+
+    '<%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>'+
+    '</span>'+
+    '<div class="cl"></div>')
+
+    <% end %>
+    hideModal();
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb
index 74e4df4f0..d401ea314 100644
--- a/app/views/users/user_homeworks.html.erb
+++ b/app/views/users/user_homeworks.html.erb
@@ -19,6 +19,10 @@
       $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new })%>");
       homework_description_editor.html("");
   }
+
+  function checkAllBox(doc){
+
+  }
 </script>
 
 <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
diff --git a/app/views/users/user_import_resource.js.erb b/app/views/users/user_import_resource.js.erb
index ce70d68ad..dc3682d30 100644
--- a/app/views/users/user_import_resource.js.erb
+++ b/app/views/users/user_import_resource.js.erb
@@ -1,7 +1,8 @@
-$('#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').html('<%= escape_javascript(render :partial => 'users/show_user_resource',:locals => {:user => @user,:homework_id=>@homework_id}) %>');
+showModal('ajax-modal', '730px');
+$('#ajax-modal').css('height','500px').css("width","730px");
 $('#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
+$('#ajax-modal').before("<div class='resourcePopupClose mt5 mr-5'>" +
+"<a href='javascript:void(0)' class='resourceClose' onclick='hideModal();'></a></div>");
+$('#ajax-modal').parent().css("top","").css("left","").css("position","fixed").css("padding-left","16px").css("padding-bottom","16px").css("padding-right","16px");
+$('#ajax-modal').parent().addClass("popbox").addClass("referenceResourcesPopup");
\ No newline at end of file
diff --git a/app/views/users/user_ref_resource_search.js.erb b/app/views/users/user_ref_resource_search.js.erb
new file mode 100644
index 000000000..52f54bee4
--- /dev/null
+++ b/app/views/users/user_ref_resource_search.js.erb
@@ -0,0 +1,2 @@
+$("#user_ref_resources").html('<%= escape_javascript(render :partial => 'resources_list',:locals=>{:attachments => @attachments})%>');
+$("#resource_ref_pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
\ No newline at end of file
diff --git a/app/views/users/user_resource_type.js.erb b/app/views/users/user_resource_type.js.erb
new file mode 100644
index 000000000..52f54bee4
--- /dev/null
+++ b/app/views/users/user_resource_type.js.erb
@@ -0,0 +1,2 @@
+$("#user_ref_resources").html('<%= escape_javascript(render :partial => 'resources_list',:locals=>{:attachments => @attachments})%>');
+$("#resource_ref_pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 8451b7365..4e6bba8a7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -365,6 +365,9 @@ RedmineApp::Application.routes.draw do
       get 'resource_preview'
       post 'rename_resource'
       get 'search_user_project'
+      get 'user_resource_type'
+      get 'user_ref_resource_search'
+      post 'import_resources_to_homework'
     # end
     end
   end
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 04f5be4f9..d357ab0e7 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -677,13 +677,13 @@ ul.list_watch{
 .w450{width: 450px;}
 
 /*引用资源库弹窗*/
-.referenceResourcesPopup {width:710px; height:auto; border:3px solid #269ac9; padding-left:20px; padding-right:20px; padding-bottom:35px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-375px; z-index:1000;}
+.referenceResourcesPopup {width:710px; height:500px !important; border:3px solid #269ac9 !important; padding-left:20px; padding-right:20px; padding-bottom:35px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-375px; z-index:1000;}
 .referenceText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; display:inline-block; font-weight:bold;}
 .referenceSearchBox {border:1px solid #e6e6e6; width:235px; height:32px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}
 .searchReferencePopup {border:none; outline:none; background-color:#ffffff; width:190px; height:32px; padding-left:10px; display:inline-block; float:left;}
-.referenceSearchIcon{width:31px; height:25px; background-color:#ffffff; background:url(../images/homepage_icon.png) -170px -135px no-repeat; display:inline-block; float:left;}
-.referenceSearchIcon:hover {background:url(../images/homepage_icon.png) -170px -190px no-repeat;}
-.referenceResourceType {font-size:14px; width:355px; height:34px; line-height:34px; vertical-align:middle; background-color:#f6f6f6; margin-top:15px;}
+.referenceSearchIcon{width:31px; height:25px; background-color:#ffffff; background:url(../images/homepage_icon.png) -180px -270px no-repeat; display:inline-block; float:left;}
+.referenceSearchIcon:hover {background:url(../images/homepage_icon.png) -180px -311px no-repeat;}
+.referenceResourceType {font-size:14px; width:475px; height:34px; line-height:34px; vertical-align:middle; background-color:#f6f6f6; margin-top:15px;}
 .referenceTypeActive {background-color:#269ac9; color:#ffffff !important;}
 a.referenceTypeBlock {color:#888888; display:inline-block; padding:0px 20px;}