diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 8b1e344ed..67d47dc26 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2223,13 +2223,13 @@ class UsersController < ApplicationController
       @attachments = get_public_resources(user_course_ids, user_project_ids)
     end
     @type = params[:type]
-    @limit = 25
+    @limit = 10
     @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,25
+    @attachments = paginateHelper @attachments,10
     respond_to do |format|
       format.js
       format.html {render :layout => 'new_base'}
diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb
index cf91b7814..545680505 100644
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@@ -93,7 +93,8 @@
           <%= submit_tag "课内搜索", :class => "blueBtn mr5 fl",:name => "incourse",:id => "incourse" %>
           <%= submit_tag "全站搜索", :class => "blueBtn mr5 fl",:name => "insite",:id => "insite" %>
           <% if is_course_teacher(User.current,@course) || (@course.publish_resource==1 && User.current.member_of_course?(@course) ) %>
-                <input class="blueBtn fr mr5" value="上传资源" onclick="course_files_upload();">
+              <input class="blueBtn fr mr5" value="上传资源" onclick="course_files_upload();">
+              <%= link_to("导入资源", import_resources_user_path(User.current, :type => 6, :course => true), :class => "blue-btn fr mr5", :remote => true) %>
           <% end %>
       <% end %>
 
diff --git a/app/views/files/_project_file.html.erb b/app/views/files/_project_file.html.erb
index 49f31355d..0725d9270 100644
--- a/app/views/files/_project_file.html.erb
+++ b/app/views/files/_project_file.html.erb
@@ -66,7 +66,7 @@
           <!--REDO: 权限测试-->
           <% if User.current.member_of?(@project) %>
               <input class="blueBtn fr mr5" value="上传资源" onclick="project_files_upload();">
-              <%= link_to("导入资源", import_resources_user_path(User.current), :class => "blue-btn fr mr5", :remote => true) %>
+              <%= link_to("导入资源", import_resources_user_path(User.current, :type => 6, :project => true), :class => "blue-btn fr mr5", :remote => true) %>
               <!--<input class="blueBtn fr mr5" value="导入资源" onclick="project_files_import();">-->
           <% end %>
       <% end %>
diff --git a/app/views/files/_subfield_files.html.erb b/app/views/files/_subfield_files.html.erb
index 1de0e8dc2..3e98b2ee5 100644
--- a/app/views/files/_subfield_files.html.erb
+++ b/app/views/files/_subfield_files.html.erb
@@ -42,6 +42,7 @@
           <%= submit_tag "栏目内搜索", :class => "blueBtn mr5 fl",:style => 'width:72px;',:name => "inorg_subfield",:id => "inorg_subfield", :onmouseover => "presscss('inorg_subfield')",:onmouseout =>"buttoncss()" %>
           <%= submit_tag "全站搜索", :class => "blueBtn mr5 fl",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %>
           <input class="blueBtn fr mr5" value="上传资源" onclick="org_upload_files(<%= org_subfield.id %>);">
+          <%= link_to("导入资源", import_resources_user_path(User.current, :type => 6, :subfield_file => true), :class => "blue-btn fr mr5", :remote => true) %>
           <%#= link_to "上传资源",subfield_upload_file_org_subfield_files_path(@org_subfield.id, :in_org => 1),:method => "post",:class=>"blueBtn fr mr5",:remote => true %>
       <% end %>
     </div><!---re_top end-->
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 0ab5c2876..be8c4bbba 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -8,7 +8,7 @@
         <%= link_to "首页",user_activities_path(User.current.id), :class => "c_white f16 db p10", :title => "回到个人首页"%>
       </li>
       <li class="navHomepageMenu fl">
-        <a href="<%=url_for(:controller => 'users', :action => 'user_resource', :id => User.current.id, :type => 1) %>" class="c_white f16 db p10">资源库</a></li>
+        <a href="<%=url_for(:controller => 'users', :action => 'user_resource', :id => User.current.id, :type => 6) %>" class="c_white f16 db p10">资源库</a></li>
       <li class="navHomepageMenu fl">
         <%= link_to "作业",  user_homeworks_user_path(User.current.id), :class => "c_white f16 db p10"%>
       </li>
diff --git a/app/views/users/_import_resource_info.html.erb b/app/views/users/_import_resource_info.html.erb
index 63a411acb..dd82e9485 100644
--- a/app/views/users/_import_resource_info.html.erb
+++ b/app/views/users/_import_resource_info.html.erb
@@ -1,271 +1,55 @@
-<%#= javascript_include_tag 'bootstrap'%>
-<%#= stylesheet_link_tag 'project' %>
-<%#= stylesheet_link_tag 'leftside' %>
-<%#= javascript_include_tag 'attachments'%>
-<div class="resource-wrapper">
-  <ul class="resource-banner">
-    <li class="fl resource-switch">
-      <a href="<%= user_resource_user_path(User.current, :type => '6') %>" class="resource-tab resource-tab-active" data-remote="true">公共资源</a>
-    </li>
-    <li class="fl resource-switch">
-      <a href="<%= user_resource_user_path(User.current, :type => '1') %>"  class="resource-tab" data-remote="true">我的资源</a>
-    </li>
-    <li class="fl w770 border-bottom h34">&nbsp;</li>
-    <div class="cl"></div>
-  </ul>
+<script>
+    $(document).ready(function(){
+        $(".subjectChoose").click(function(){
+            $(".subjectChoose").removeClass("chooseActive");
+            $(this).addClass("chooseActive");
+        });
+        $(".popupClose").click(function(){
+            $(".popupWrap").hide();
+        });
+    });
+</script>
+<div class="f16 fb fontBlue mb10">选用资源库中的资源</div>
+<div class="subjectList fl mr10">
+  <a href="<%= import_resources_user_path(User.current, :type => '6') %>" class="subjectChoose chooseActive fl" data-remote="true">公共资源</a>
+  <a href="<%= import_resources_user_path(User.current, :type => '1') %>"  class="subjectChoose fl" data-remote="true">我的资源</a>
+  <%= form_tag( url_for(:controller => 'users', :action => 'resource_search', :id => User.current.id),
+                :remote => true , :method => 'get',  :id => 'resource_search_form') do %>
+      <input type="text" name="search" placeholder="输入资源关键词进行搜索" class="subjectSearch fr" />
+      <%= hidden_field_tag(:type,type.nil? ? 1 : type) %>
+  <% end %>
+
   <div class="cl"></div>
-  <div id="users_setting">
-    <div id="search_div">
-      <%= form_tag( url_for(:controller => 'users', :action => 'resource_search', :id => User.current.id),
-                    :remote => true , :method => 'get', :class => 'resourcesSearchloadBox mt10', :id => 'resource_search_form') do %>
-          <input type="text" name="search" placeholder="输入资源关键词进行搜索" class="searchResource" />
-          <%= hidden_field_tag(:type,type.nil? ? 1 : type) %>
-          <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :style => 'border-style:none' %>
-          <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
-      <% end %>
-    </div>
+  <div style="height:441px; min-height:441px; max-height:441px;">
+    <ul class="subjectBanner mt10">
+      <li class="subjectName fl hidden"><span style="padding-left:15px;">资源名称</span></li>
+      <li class="subjectType fl">类别</li>
+      <li class="subjectCount fl">大小</li>
+      <li class="subjectPublisher fl">上传者</li>
+      <li class="fl subjectDate">上传时间</li>
+    </ul>
+    <% @attachments.each do |attach| %>
+        <ul class="subjectRow">
+          <li class="subjectName fl hidden">
+            <label>
+              <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;"  />
+              <span><%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%></span>
+            </label>
+          </li>
+          <li class="subjectType fl"><%= get_resource_type(attach.container_type)%></li>
+          <li class="subjectCount fl"><%= number_to_human_size(attach.filesize) %></li>
+          <li class="subjectPublisher fl"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
+          <li class="fl subjectDate"><%= format_date(attach.created_on) %></li>
+        </ul>
+    <% end %>
   </div>
-  <div class="cl"></div>
-  <ul class="resource-list-tab mt10">
-    <li class="resource-list-checkbox fl"> </li>
-    <li class="resource-list-name fl">资源名称</li>
-    <li class="resource-list-time fr">上传时间</li>
-    <li class="resource-list-uploader fr">上传者</li>
-    <li class="resource-list-type fr">类别</li>
-    <li class="resource-list-size fr">大小</li>
-    <li class="resource-list-from fr">资源来源</li>
-  </ul>
-  <div class="cl"></div>
-  <form id="resources_list_form">
-    <div id="resources_list">
-      <% @attachments.each do |attach| %>
-          <ul class="resource-list" onmouseover="if($('#contextMenu').css('display') != 'block')$(this).children().css('background-color', '#e1e1e1')" onmouseout=" if($('#contextMenu').css('display') == 'none')$(this).children().css('background-color', 'white')">
-            <li class="resource-list-checkbox fl">
-              <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
-              <!--<input name="checkbox2" type="checkbox" value="" class="resourcesCheckbox" />-->
-            </li>
-            <li class="resource-list-name fl hidden">
-              <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack' %>
-            </li>
-            <li class="resource-list-time fr"><%= format_date(attach.created_on) %></li>
-            <li style="display: none"><%= attach.id %></li>
-            <li class="resource-list-uploader fr hidden"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
-            <li style="display: none"><%= attach.author_id %></li>
-            <li class="resource-list-type fr"><%= get_resource_type(attach.container_type)%></li>
-            <li style="display: none"><%= attach.id %></li>
-            <li class="resource-list-size fr"><%= number_to_human_size(attach.filesize) %></li>
-            <li style="display: none"><%= attach.id %></li>
-            <li class="resource-list-from fr hidden" title="<%= get_resource_origin(attach) %>"><%= get_resource_origin(attach) %></li>
-            <li style="display: none"><%= attach.id %></li>
-          </ul>
-          <div class="cl"></div>
-      <% end %>
-    </div>
-    <div class="cl"></div>
-    <div class="resource-list-option fl">
-      <div class="resource-check-all">
-        <input id="checkboxAll" type="checkbox" value="" onclick="all_select();"  class="resourcesCheckbox" />
-      </div>
-      <a href="javascript:void(0);" class="replyGrey1 mr15" onclick="all_select();">全选</a>
-      <a href="javascript:void(0);" class="replyGrey" onclick="batch_delete();">删除</a>
-      <div class="resourcesSelectSend">
-        <div class="fl">选择&nbsp;<span class="c_red" id="res_count">0</span>&nbsp;个资源</div>
-        <div class="resourcesSelectSendButton" onclick="batch_send();">
-          <a href="javascript:void(0);" class="sendButtonBlue db" data-remote="true" >发送</a>
-        </div>
-      </div>
-    </div>
-  </form>
-  <div class="cl"></div>
-  <div>
+
+  <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText">选用</a></div>
+  <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText">取消</a></div>
+  <div class="pageRoll mt0">
     <ul class="wlist" id="pages" style="margin-top: 5px;">
       <%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>
     </ul>
   </div>
-
-  <div class="cl"></div>
-  <!--<div id="upload_box" style="display: none">-->
-  <!--<%#= render :partial => 'upload_resource' ,:locals => {:user=>@user}%>-->
-  <!--</div>-->
-
-</div>
-<div class="cl"></div>
-
-
-
-<div class="popupWrap w615"> <a href="javascript:void(0);" class="popupClose"></a>
-  <div class="f16 fb fontBlue mb10">选用资源库中的资源</div>
-  <div class="subjectList fl mr10">
-    <a href="<%= user_resource_user_path(User.current, :type => '6') %>" class="subjectChoose chooseActive fl" data-remote="true">公共资源</a>
-    <a href="<%= user_resource_user_path(User.current, :type => '1') %>"  class="subjectChoose fl" data-remote="true">我的资源</a>
-    <%= form_tag( url_for(:controller => 'users', :action => 'resource_search', :id => User.current.id),
-                  :remote => true , :method => 'get', :class => 'resourcesSearchloadBox mt10', :id => 'resource_search_form') do %>
-        <input type="text" name="search" placeholder="输入资源关键词进行搜索" class="searchResource" />
-        <%= hidden_field_tag(:type,type.nil? ? 1 : type) %>
-        <%= submit_tag '', :class => 'homepageSearchIcon', :onfocus => 'this.blur();', :style => 'border-style:none' %>
-        <!--<a href="javascript:void(0);" onclick='this.parent.submit();return false;' class="searchIcon"></a>-->
-    <% end %>
-    <div class="cl"></div>
-    <div style="height:441px; min-height:441px; max-height:441px;">
-
-
-
-
-      <ul class="subjectBanner mt10">
-        <li class="subjectName fl hidden"><span style="padding-left:15px;">资源名称</span></li>
-        <li class="subjectType fl">类别</li>
-        <li class="subjectCount fl">大小</li>
-        <li class="subjectPublisher fl">上传者</li>
-        <li class="fl subjectDate">上传时间</li>
-      </ul>
-
-      <% @attachments.each do |attach| %>
-          <ul class="subjectRow" onmouseover="if($('#contextMenu').css('display') != 'block')$(this).children().css('background-color', '#e1e1e1')" onmouseout=" if($('#contextMenu').css('display') == 'none')$(this).children().css('background-color', 'white')">
-            <li class="resource-list-checkbox fl">
-              <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="subjectName fl hidden" />
-              <!--<input name="checkbox2" type="checkbox" value="" class="resourcesCheckbox" />-->
-            </li>
-            <li class="resource-list-name fl hidden">
-              <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack' %>
-            </li>
-
-
-            <li class="resource-list-uploader fr hidden"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
-
-            <li class="resource-list-type fr"><%= get_resource_type(attach.container_type)%></li>
-
-            <li class="resource-list-size fr"><%= number_to_human_size(attach.filesize) %></li>
-
-            <li class="resource-list-from fr hidden" title="<%= get_resource_origin(attach) %>"><%= get_resource_origin(attach) %></li>
-            <li class="fl subjectDate"><%= format_date(attach.created_on) %></li>
-          </ul>
-          <div class="cl"></div>
-      <% end %>
-      <ul class="subjectRow">
-        <li class="subjectName fl hidden">
-          <label>
-            <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
-            <span>123456.jpg</span></label>
-        </li>
-        <li class="subjectType fl">课程资源</li>
-        <li class="subjectCount fl">123.0KB</li>
-        <li class="subjectPublisher fl">尹刚</li>
-        <li class="fl subjectDate">2016-01-21</li>
-      </ul>
-      <ul class="subjectRow">
-        <li class="subjectName fl hidden">
-          <label>
-            <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
-            <span>123456.jpg</span></label>
-        </li>
-        <li class="subjectType fl">项目资源</li>
-        <li class="subjectCount fl">123.0KB</li>
-        <li class="subjectPublisher fl">尹刚</li>
-        <li class="fl subjectDate">2016-01-21</li>
-      </ul>
-      <ul class="subjectRow">
-        <li class="subjectName fl hidden">
-          <label>
-            <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
-            <span>123456.jpg</span></label>
-        </li>
-        <li class="subjectType fl">附件</li>
-        <li class="subjectCount fl">123.0KB</li>
-        <li class="subjectPublisher fl">尹刚</li>
-        <li class="fl subjectDate">2016-01-21</li>
-      </ul>
-      <ul class="subjectRow">
-        <li class="subjectName fl hidden">
-          <label>
-            <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
-            <span>123456.jpg</span></label>
-        </li>
-        <li class="subjectType fl">课程资源</li>
-        <li class="subjectCount fl">123.0KB</li>
-        <li class="subjectPublisher fl">尹刚</li>
-        <li class="fl subjectDate">2016-01-21</li>
-      </ul>
-      <ul class="subjectRow">
-        <li class="subjectName fl hidden">
-          <label>
-            <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
-            <span>123456.jpg</span></label>
-        </li>
-        <li class="subjectType fl">课程资源</li>
-        <li class="subjectCount fl">123.0KB</li>
-        <li class="subjectPublisher fl">尹刚</li>
-        <li class="fl subjectDate">2016-01-21</li>
-      </ul>
-      <ul class="subjectRow">
-        <li class="subjectName fl hidden">
-          <label>
-            <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
-            <span>123456.jpg</span></label>
-        </li>
-        <li class="subjectType fl">课程资源</li>
-        <li class="subjectCount fl">123.0KB</li>
-        <li class="subjectPublisher fl">尹刚</li>
-        <li class="fl subjectDate">2016-01-21</li>
-      </ul>
-      <ul class="subjectRow">
-        <li class="subjectName fl hidden">
-          <label>
-            <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
-            <span>123456.jpg</span></label>
-        </li>
-        <li class="subjectType fl">课程资源</li>
-        <li class="subjectCount fl">123.0KB</li>
-        <li class="subjectPublisher fl">尹刚</li>
-        <li class="fl subjectDate">2016-01-21</li>
-      </ul>
-      <ul class="subjectRow">
-        <li class="subjectName fl hidden">
-          <label>
-            <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
-            <span>123456.jpg</span></label>
-        </li>
-        <li class="subjectType fl">课程资源</li>
-        <li class="subjectCount fl">123.0KB</li>
-        <li class="subjectPublisher fl">尹刚</li>
-        <li class="fl subjectDate">2016-01-21</li>
-      </ul>
-      <ul class="subjectRow">
-        <li class="subjectName fl hidden">
-          <label>
-            <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
-            <span>123456.jpg</span></label>
-        </li>
-        <li class="subjectType fl">课程资源</li>
-        <li class="subjectCount fl">123.0KB</li>
-        <li class="subjectPublisher fl">尹刚</li>
-        <li class="fl subjectDate">2016-01-21</li>
-      </ul>
-      <ul class="subjectRow">
-        <li class="subjectName fl hidden">
-          <label>
-            <input type="checkbox" name="subjectName" class="mr5" style="vertical-align:middle;" />
-            <span>123456.jpg</span></label>
-        </li>
-        <li class="subjectType fl">课程资源</li>
-        <li class="subjectCount fl">123.0KB</li>
-        <li class="subjectPublisher fl">尹刚</li>
-        <li class="fl subjectDate">2016-01-21</li>
-      </ul>
-    </div>
-    <div class="courseSendSubmit mr15"><a href="javascript:void(0);" class="sendSourceText">选用</a></div>
-    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText">取消</a></div>
-    <div class="pageRoll mt0">
-      <div class="pageCell"><a href="javascript:void(0);" class="linkBlue">上一页</a></div>
-      <div class="pageCell pageCellActive"><a href="javascript:void(0);" class="c_white">1</a></div>
-      <div class="pageCell"><a href="javascript:void(0);" class="fontBlue">2</a></div>
-      <div class="pageCell"><a href="javascript:void(0);" class="fontBlue">3</a></div>
-      <div class="pageCell"><a href="javascript:void(0);" class="fontBlue">...</a></div>
-      <div class="pageCell"><a href="javascript:void(0);" class="fontBlue">14</a></div>
-      <div class="pageCell"><a href="javascript:void(0);" class="linkBlue">下一页</a></div>
-    </div>
-    <div class="cl"></div>
-  </div>
   <div class="cl"></div>
 </div>
-
-
diff --git a/app/views/users/import_resources.js.erb b/app/views/users/import_resources.js.erb
index ce5362bcb..e3f640931 100644
--- a/app/views/users/import_resources.js.erb
+++ b/app/views/users/import_resources.js.erb
@@ -1,8 +1,12 @@
 $('#ajax-modal').html('<%= escape_javascript( render :partial => 'users/import_resource_info', :locals => {:user => User.current, :type => 1} ) %>');
 showModal('ajax-modal', '615px');
 $('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
-$('#ajax-modal').parent().css("top","10%").css("left","36%").css("border","3px solid #269ac9");
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal()' style='margin-left: 580px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+<% if params[:project] %>
+$('#ajax-modal').parent().css("top","10%").css("left","34%").css("border","3px solid #269ac9");
+<% else %>
+$('#ajax-modal').parent().css("top","20%").css("left","42%").css("border","3px solid #269ac9");
+<% end %>
 $('#ajax-modal').parent().addClass("popbox_polls");
 
 
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 3840fd892..a0bca31b0 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1263,3 +1263,25 @@ div.disable_link {background-color: #c1c1c1 !important;}
 .mh18 {max-height: 18px;}
 .relatePWrap{max-height: 210px;overflow:hidden;}/*160114课程推荐*/
 .courseR {width:220px; padding:10px; background-color:#ffffff; margin-top:10px;}
+
+/*导入题库样式*/
+.popupWrap {border:3px solid #269ac9; padding:15px; background-color:#ffffff; position:relative; z-index:1000;}
+.subjectList {width:585px;}
+.subjectDetail {width:385px;}
+a.subjectChoose {padding:8px 20px; background-color:#f1f1f1; color:#888888;}
+a.chooseActive {background-color:#269ac9; color:#ffffff;}
+.subjectBanner {width:585px; height:40px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;}
+.subjectBanner li {height:40px; line-height:40px; vertical-align:middle;}
+.subjectName {width:270px; padding-left:10px; padding-right:10px;}
+.subjectPublisher {width:80px; text-align:center;}
+.subjectDate {width:80px; text-align:center;}
+.subjectRow {width:585px; height:40px; color:#7a7a7a; font-size:12px;}
+.subjectRow li {height:40px; line-height:40px; vertical-align:middle;}
+.subjectSearch {border:1px solid #dddddd; height:32px; width:250px;}
+.subjectInfo {width:385px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
+.subjectWrap {border:1px solid #dddddd; border-top:none; padding:10px; width:365px; height:460px; overflow-y:auto;}
+.subjectIntro {color:#585858; line-height:18px; font-size:12px;}
+.subjectContent {color:#888888; line-height:18px; font-size:12px;}
+.popupClose {background:url(../images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000; right:10px; top:5px;}
+.subjectType {width:70px; text-align:center;}
+.subjectCount {width:65px; text-align:center;}
diff --git a/public/stylesheets/org.css b/public/stylesheets/org.css
index aa2d0be18..eaabcafa6 100644
--- a/public/stylesheets/org.css
+++ b/public/stylesheets/org.css
@@ -117,4 +117,33 @@ div.flash {margin-top :0px !important}
 .maxh360 {max-height: 810px;}
 .lh18 { line-height: 18px;}
 
-a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; padding-left: 20px;}
\ No newline at end of file
+a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; padding-left: 20px;}
+/*导入题库样式*/
+.popupWrap {border:3px solid #269ac9; padding:15px; background-color:#ffffff; position:relative; z-index:1000;}
+.subjectList {width:585px;}
+.subjectDetail {width:385px;}
+a.subjectChoose {padding:8px 20px; background-color:#f1f1f1; color:#888888;}
+a.chooseActive {background-color:#269ac9; color:#ffffff;}
+.subjectBanner {width:585px; height:40px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;}
+.subjectBanner li {height:40px; line-height:40px; vertical-align:middle;}
+.subjectName {width:270px; padding-left:10px; padding-right:10px;}
+.subjectPublisher {width:80px; text-align:center;}
+.subjectDate {width:80px; text-align:center;}
+.subjectRow {width:585px; height:40px; color:#7a7a7a; font-size:12px;}
+.subjectRow li {height:40px; line-height:40px; vertical-align:middle;}
+.subjectSearch {border:1px solid #dddddd; height:32px; width:250px;}
+.subjectInfo {width:385px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
+.subjectWrap {border:1px solid #dddddd; border-top:none; padding:10px; width:365px; height:460px; overflow-y:auto;}
+.subjectIntro {color:#585858; line-height:18px; font-size:12px;}
+.subjectContent {color:#888888; line-height:18px; font-size:12px;}
+.popupClose {background:url(../images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000; right:10px; top:5px;}
+.subjectType {width:70px; text-align:center;}
+.subjectCount {width:65px; text-align:center;}
+a.blue-btn {
+    padding: 4px 7px;
+    color: #FFF;
+    border: none;
+    background-color: #269ac9;
+    cursor: pointer;
+    text-align: center;
+}
\ No newline at end of file
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 1dc5556d3..7e1ae654f 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -1177,4 +1177,26 @@ div.disable_link {background-color: #c1c1c1 !important;}
 .number-line-old {background-color:#ffdddd; border-color:#f1c0c0;}
 .code-line-new {background-color:#eaffea;}
 .number-line-new {background-color:#dbffdb; border-color:#c1e9c1;}
-.branch-label {padding-right: 5px; border-radius:2px; color:#888888; display:inline-block; background-color:#f8fafc;}
+.branch-label {padding-right: 5px; border-radius:2px; color:#888888; display:inline-block; background-color:#f8fafc;}
+
+/*导入题库样式*/
+.popupWrap {border:3px solid #269ac9; padding:15px; background-color:#ffffff; position:relative; z-index:1000;}
+.subjectList {width:585px;}
+.subjectDetail {width:385px;}
+a.subjectChoose {padding:8px 20px; background-color:#f1f1f1; color:#888888;}
+a.chooseActive {background-color:#269ac9; color:#ffffff;}
+.subjectBanner {width:585px; height:40px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;}
+.subjectBanner li {height:40px; line-height:40px; vertical-align:middle;}
+.subjectName {width:270px; padding-left:10px; padding-right:10px;}
+.subjectPublisher {width:80px; text-align:center;}
+.subjectDate {width:80px; text-align:center;}
+.subjectRow {width:585px; height:40px; color:#7a7a7a; font-size:12px;}
+.subjectRow li {height:40px; line-height:40px; vertical-align:middle;}
+.subjectSearch {border:1px solid #dddddd; height:32px; width:250px;}
+.subjectInfo {width:385px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
+.subjectWrap {border:1px solid #dddddd; border-top:none; padding:10px; width:365px; height:460px; overflow-y:auto;}
+.subjectIntro {color:#585858; line-height:18px; font-size:12px;}
+.subjectContent {color:#888888; line-height:18px; font-size:12px;}
+.popupClose {background:url(../images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block; position: absolute; z-index: 1000; right:10px; top:5px;}
+.subjectType {width:70px; text-align:center;}
+.subjectCount {width:65px; text-align:center;}