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

app/views/homework_common/index.html.erb

@@ -3,13 +3,13 @@
         $("#homework_name").val("");
         $("#homework_publish_time").val("");
         $("#homework_end_time").val("");
-        document.getElementById("anonymous_comment").checked = true;
         $("#course_id").val($("#option_select").val());
+        $("#homeworkSetting").addClass("undis");
+        $("#homeworkSetting").html("");
         $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => HomeworkCommon.new,:has_program => true,:has_group => true})%>");
         //homework_description_editor.html("");
         $("#homework_name_span").text("");
         $("#homework_end_time_span").text("");
-        $("#homework_end_time_span").text("");
         $("#homework_course_id_span").text("");
         $("#homework_editor").toggle();
     }

app/views/student_work/_evaluation_un_group_member_work.html.erb

@@ -23,7 +23,7 @@
         <div class="flex-cell"><span class="<%= score_color st.teaching_asistant_score%> ml35"><%= st.teaching_asistant_score.nil? ? "--" : format("%.1f",st.teaching_asistant_score)%></span></div>
         <% if @homework.anonymous_comment == 0 %>
             <div class="flex-cell">
-              <div class="<%= score_color st.student_score%> student_score_info ml35">
+              <div class="<%= score_color st.student_score%> student_score_info ml35 pr">
                 <% if st.student_score.nil? %>
                     <span title="该作品未被匿评">未参与</span>
                 <% else %>
@@ -45,7 +45,7 @@
         <% end %>
         <div class="flex-cell">
           <% score = st.work_score %>
-          <div class="<%= score_color score%> student_final_scor_info ml35" style="display: inline">
+          <div class="<%= score_color score%> student_final_scor_info ml35 pr" style="display: inline">
             <%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%>
             <% unless score.nil?%>
                 <div class="g_infoNi none width180">

app/views/student_work/_show.html.erb

@@ -115,7 +115,7 @@
             <%= render :partial => 'student_work_score',:locals => {:score => student_score,:is_last => student_score == student_work_scores.last}%>
           </div>
       <% end%>
-      <% if is_member_work && student_work_scores.empty? %>
+      <% if is_member_work && student_work_scores.empty? && !@is_teacher %>
         <p class="c_red" style="text-align: center">暂无评分</p>
       <% end %>
     </div>

public/javascripts/course.js

@@ -857,13 +857,14 @@ function regex_group_attr(){
 
 //验证编程作业的参数
 function regex_program_attr() {
+    var result = true;
     $.each($('#programHomework textarea.InputBox'), function(i, val){
-        if ($(val).val().length<=0) {
+        if (result && $(val).val().length<=0) {
             $(val)[0].focus();
-            return false;
+            result = false;
         }
     });
-    return true;
+    return result;
 }
 
 function regexHomeworkCommonName()

public/javascripts/new_user.js

@@ -236,13 +236,14 @@ function regex_group_attr(){
 
 //验证编程作业的参数
 function regex_program_attr() {
+    var result = true;
     $.each($('#programHomework textarea.InputBox'), function(i, val){
-        if ($(val).val().length<=0) {
+        if (result && $(val).val().length<=0) {
             $(val)[0].focus();
-            return false;
+            result = false;
         }
     });
-    return true;
+    return result;
 }
 
 //老师导入作业时查询作业

public/stylesheets/css/courses.css

@@ -234,7 +234,7 @@ a.hworkExport {background:url(/images/homepage_icon2.png) -10px -401px no-repeat
 a.hworkSetting {background:url(/images/homepage_icon2.png) -10px -450px no-repeat; padding-left:23px;}
 .hworkInfor {font-size:12px; color:#269ac9; width:80px; height:40px; vertical-align:middle; float:left; line-height:40px; text-align:center; font-weight:bold;}
 .infoNi{ width:100px; padding:5px;-moz-border-radius:3px;  -webkit-border-radius:3px;  border-radius:3px; box-shadow:0px 0px 5px #194a81; color:#666; background:#fff; text-align:left; line-height:2; position:absolute; margin-top:-24px;margin-left: 40px; z-index:99;}
-.g_infoNi{ width:100px; padding:5px;-moz-border-radius:3px;  -webkit-border-radius:3px;  border-radius:3px; box-shadow:0px 0px 5px #194a81; color:#666; background:#fff; text-align:left; line-height:2; position:absolute; margin-top:10px;margin-left: 80px; z-index:99;}
+.g_infoNi{ width:100px; padding:5px;-moz-border-radius:3px;  -webkit-border-radius:3px;  border-radius:3px; box-shadow:0px 0px 5px #194a81; color:#666; background:#fff; text-align:left; line-height:2; position:absolute; left:0; z-index:99;}
 .problemTxt {width:660px; margin-left:10px; color:#777777; position:relative;}
 .rTxtTit{width:560px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#269ac9; font-size:14px;}
 .hworkSearchBox {border:1px solid #e6e6e6; width:185px; float:left; background-color:#ffffff;}