Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course

Conflicts:
	app/views/users/user_homeworks.html.erb

app/views/users/user_homeworks.html.erb

@@ -56,11 +56,13 @@
       <%=render :partial => 'homework_repository_list', :locals => {:homeworks => @homeworks,:type=>'1',:is_import => 0,:property => @property,:search=>''} %>
     </div>
 
-    <div class="pages">
+        <div style="text-align:center;">
+          <div class="pages" style="width:auto; display:inline-block;">
             <ul  id="homework_pository_ref_pages">
               <%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
             </ul>
-    </div>
             <div class="cl"></div>
           </div>
         </div>
+  </div>
+</div>

public/stylesheets/css/public.css

@@ -527,6 +527,7 @@ a.list-title{ font-size:14px; font-weight: bold; color:#000; white-space:nowrap;
 a.pages-big{ width:50px;}
 .pages .active{ background-color:#3b94d6; border:1px solid #3b94d6; color:#fff;}
 .pages{width:330px; margin:20px auto 10px;}
+.pages li {display:inline-block;}
 
 /*课程列表界面样式*/
 a.course-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; width:590px;}