Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/users/_user_homework_form.html.erb

@@ -72,6 +72,7 @@
   <input type="hidden" name="homework_type" value="1">
 
 </div>
+  </div>
 <div class="cl"></div>
 
 

app/views/users/_user_homework_list.html.erb

@@ -53,4 +53,5 @@
     </div><!----HomeWork end-->
 <% end%>
 
-<input type="hidden" value="<%= page%>" id="user_show_more_homework" />
+<input type="hidden" value="<%= page%>" />
+<%= link_to "加载更多",user_homeworks_user_path(User.current.id),:id => "user_show_more_homework",:remote => "true",:class => "loadMore mt10 f_grey"%>

app/views/users/user_homeworks.html.erb

@@ -1,17 +1,4 @@
 <script type="text/javascript">
-  var scrollHandler = function(){
-      if ($(window).scrollTop() == $(document).height() - $(window).height()) {
-          $.get(
-                  '<%= user_homeworks_user_path(User.current.id)%>',
-                  { page : $("#user_show_more_homework").val()},
-                  function (data) {
-
-                  }
-          );
-      }
-  };
-  $(window).scroll(scrollHandler);
-
   function reset_homework(){
       $("#homework_name").val("");
       $("#homework_end_time").val("<%= (Time.now  + 3600 * 24).strftime('%Y-%m-%d')%>");