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

app/views/homework_attach/_addjour.html.erb

@@ -21,7 +21,16 @@
 
     function submit_jours(is_teacher)
     {
-        if(!is_teacher&&$("#stars_value").val() == "0"){alert("您还没有打分");return;}
+        if(!is_teacher&&$("#stars_value").val() == "0"){
+            if(confirm('是否确定评分为0分?'))
+            {
+
+            }
+            else
+            {
+                return;
+            }
+        }
         if(!is_teacher&&$("#new_form_user_message").val() == ""){alert("您还没有填写评语");return;}
         $('#new_form_user_message').parent().submit();
     }

app/views/homework_attach/_review.html.erb

@@ -22,7 +22,7 @@
                   </span>
                 <% end %>
               </span>
-              <span style="color:#a6a6a6; margin-right:30px; margin-left:10px;">
+              <span style="color:#a6a6a6; margin-right:20px; margin-left:10px;">
                 <%= format_time(review.created_at) %>
               </span>
               <span style="font-weight:bold; color:#a6a6a6; float: right;">