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

Conflicts:
	app/views/homework_attach/_homework.html.erb

app/views/homework_attach/_homework.html.erb

@@ -35,7 +35,7 @@
 <li class="wscore">
   <%= is_student_batch_homework ? l(:label_my_score) : l(:label_student_score)%>:
   <span class="c_red">
-    <%= homework.s_score.nil? ? l(:label_without_score) : format("%.2f",((is_student_batch_homework ? homework.m_score : homework.s_score).nil? ? 0:(is_student_batch_homework ? homework.m_score : homework.s_score))) %>
+    <%= homework.s_score.nil? ? l(:label_without_score) : format("%.2f",(is_student_batch_homework ? (homework.m_score.nil? ? 0 : homework.m_score) : (homework.s_score.nil? ? 0 : homework.s_score))) %>
   </span>
 </li>
 <% if is_teacher %>

app/views/homework_attach/show.js.erb

@@ -2,7 +2,7 @@ $('#ajax-modal').html('<%= escape_javascript(render :partial => 'show',:locals =
 showModal('ajax-modal', '513px');
 $('#ajax-modal').css('height','569px');
 $('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
         "<a href='#' onclick='hidden_homework_atert_form("+
         <%= @cur_page%> + "," + <%= @cur_type%> +
         ");'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");