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

app/views/student_work/edit.html.erb

@@ -62,10 +62,13 @@
 </div>
 <script type="text/javascript">
     function popupRegex(){
-        $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
+        if(regexStudentWorkName()&&regexStudentWorkDescription())
-        showModal('ajax-modal', '500px');
+        {
-        $('#ajax-modal').siblings().remove();
+            $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
-        $('#ajax-modal').parent().css("top","").css("left","");
+            showModal('ajax-modal', '500px');
-        $('#ajax-modal').parent().addClass("anonymos");
+            $('#ajax-modal').siblings().remove();
+            $('#ajax-modal').parent().css("top","").css("left","");
+            $('#ajax-modal').parent().addClass("anonymos");
+        }
     }
 </script>

app/views/student_work/new.html.erb

@@ -121,10 +121,13 @@
 </div>
 <script type="text/javascript">
   function popupRegex(){
-      $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
+      if(regexStudentWorkName()&&regexStudentWorkDescription())
-      showModal('ajax-modal', '500px');
+      {
-      $('#ajax-modal').siblings().remove();
+          $('#ajax-modal').html("<div><p align='center' style='margin-top: 35px'>作品信息完整性校验中，请稍等...</p></div>");
-      $('#ajax-modal').parent().css("top","").css("left","");
+          showModal('ajax-modal', '500px');
-      $('#ajax-modal').parent().addClass("anonymos");
+          $('#ajax-modal').siblings().remove();
+          $('#ajax-modal').parent().css("top","").css("left","");
+          $('#ajax-modal').parent().addClass("anonymos");
+      }
   }
 </script>