调整题库高度与资源库一致

app/controllers/users_controller.rb

@@ -387,12 +387,12 @@ class UsersController < ApplicationController
       @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}")
     end
     @type = params[:type]
-    @limit = 15
+    @limit = 25
     @is_remote = true
     @hw_count = @homeworks.count
     @hw_pages = Paginator.new @hw_count, @limit, params['page'] || 1
     @offset ||= @hw_pages.offset
-    @homeworks = paginateHelper @homeworks,15
+    @homeworks = paginateHelper @homeworks,25
     respond_to do |format|
       format.js
       format.html {render :layout => 'static_base'}
@@ -546,13 +546,13 @@ class UsersController < ApplicationController
     end
     @type = params[:type]
     @property = params[:property]
-    @limit = 15
+    @is_import = params[:is_import]
+    @limit = params[:is_import].to_i == 1 ? 15 : 25
     @is_remote = true
     @hw_count = @homeworks.count
     @hw_pages = Paginator.new @hw_count, @limit, params['page'] || 1
     @offset ||= @hw_pages.offset
-    @homeworks = paginateHelper @homeworks,15
-    @is_import = params[:is_import]
+    @homeworks = paginateHelper @homeworks,@limit
     respond_to do |format|
       format.js
     end
@@ -608,12 +608,12 @@ class UsersController < ApplicationController
     end
 =end
     @type = params[:type]
-    @limit = 15
+    @limit = params[:is_import].to_i == 1 ? 15 : 25
     @is_remote = true
     @hw_count = @homeworks.count
     @hw_pages = Paginator.new @hw_count, @limit, params['page'] || 1
     @offset ||= @hw_pages.offset
-    @homeworks = paginateHelper @homeworks,15
+    @homeworks = paginateHelper @homeworks,@limit
     @is_import = params[:is_import]
     @property = params[:property]
     @search = search

app/views/users/_homework_repository_detail.html.erb

@@ -2,7 +2,7 @@
   <div class="subjectInfo">题目信息</div>
   <div class="subject-content-wrapper">
     <% if homework.nil? %>
-        <span id="homework_notice_span">本题库遵循创作共用许可证<br/><br/>
+        <span id="homework_notice_span"><span class="center db">本题库遵循创作共用许可证</span><br>
 
 教师给学生出题本质上是一种创作行为，题目的作者通常为此付出大量时间和精力。好的题目不仅能加深学生对知识点的理解，还能激发学生兴趣，提升学习效率。为此，本网站的题库许可证基于创作共用许可证（ Creative Commons License ）建立，其核心条款包括：<br/><br/>
 

app/views/users/user_homeworks.html.erb

@@ -33,7 +33,7 @@
 
 <div class="homepageContentContainer">
   <div class="homepageContent">
-    <div class="resource-wrapper mt10">
+    <div class="resource-wrapper">
         <ul class="resource-banner">
           <li class="fl resource-switch">
             <a href="<%= user_homework_type_user_path(@user,:is_import => 0) %>" id="public_homeworks_choose" class="resource-tab resource-tab-active" data-remote="true">公共题库</a>

public/stylesheets/new_user.css

@@ -1466,13 +1466,13 @@ a.choose-active {background-color:#269ac9; color:#ffffff;}
 .whiteSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
 
 /*20160301新题库样式*/
-.subject-list-banner {width:685px; height:34px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;}
-.subject-list-banner li {height:34px; line-height:34px; vertical-align:middle;}
+.subject-list-banner {width:685px; height:40px; background-color:#f1f1f1; border-top:1px solid #eaeaea; color:#7a7a7a; font-size:14px;}
+.subject-list-banner li {height:40px; line-height:40px; vertical-align:middle;}
 .subject-list-name {width:260px; padding-left:10px; padding-right:10px;}
 .subject-list-publisher {width:80px; text-align:center;}
 .subject-list-date {width:70px; text-align:center;}
-.subject-list-row {width:685px; height:30px; color:#7a7a7a; font-size:12px;}
-.subject-list-row li {height:30px; line-height:30px; vertical-align:middle;}
+.subject-list-row {width:685px; height:40px; color:#7a7a7a; font-size:12px;}
+.subject-list-row li {height:40px; line-height:40px; vertical-align:middle;}
 .subject-list-search {border:1px solid #dddddd; height:32px; width:250px;}
 .subject-list-info {width:385px; background-color:#f1f1f1; border:1px solid #dddddd; height:32px; line-height:32px; vertical-align:middle; text-align:center; color:#7a7a7a;}
 .subject-list-wrap {border:1px solid #dddddd; border-top:none; padding:10px; width:365px; height:460px; overflow-y:auto;}