Merge branch 'educoder' into develop

app/views/shixuns/_settings_edit.html.erb

@@ -227,19 +227,19 @@
       <% end %>
     </div>
 
-    <div class="mb10 edu-back-white padding40-20">
+<!--    <div class="mb10 edu-back-white padding40-20">-->
-      <p class="color-grey-6 font-16 mb30">程序最大执行时间</p>
+<!--      <p class="color-grey-6 font-16 mb30">程序最大执行时间</p>-->
-      <div class="df">
+<!--      <div class="df">-->
-        <span class="mr30 color-orange pt10">*</span>
+<!--        <span class="mr30 color-orange pt10">*</span>-->
-        <div class="flex1 mr20">
+<!--        <div class="flex1 mr20">-->
-          <%= f.text_field :exec_time, :class => "fl input-48-45 width20 greyInput", :placeholder => "请输入程序执行时间" %>
+          <%#= f.text_field :exec_time, :class => "fl input-48-45 width20 greyInput", :placeholder => "请输入程序执行时间" %>
-          <span class="fl ml10 mt6 color-grey">秒</span>
+<!--          <span class="fl ml10 mt6 color-grey">秒</span>-->
-        </div>
+<!--        </div>-->
-        <div style="width: 57px;">
+<!--        <div style="width: 57px;">-->
-          <span class="color-orange mt8 fl none" id="shixun_exec_time"><i class="fa fa-exclamation-circle mr3"></i>必填项</span>
+<!--          <span class="color-orange mt8 fl none" id="shixun_exec_time"><i class="fa fa-exclamation-circle mr3"></i>必填项</span>-->
-        </div>
+<!--        </div>-->
-      </div>
+<!--      </div>-->
-    </div>
+<!--    </div>-->
     <div class="mb10 edu-back-white padding40-20">
       <p class="color-grey-6 font-16 mb30">命令行</p>
       <li class="mb20">
@@ -421,8 +421,8 @@
             } else {
                 $("#test_script_code").hide();
             }
-            if ($("#shixun_exec_time").val() == "")
+            // if ($("#shixun_exec_time").val() == "")
-                return;
+            //     return;
             $("#edit_shixun_" + id).submit();
         }
     }

app/views/shixuns/_settings_show.html.erb

@@ -40,12 +40,12 @@
   </div>
 </div>
 
-<div class="edu-back-white mb10 padding40-20 clearfix">
+<!--<div class="edu-back-white mb10 padding40-20 clearfix">-->
-  <p class="color-grey-6 font-16 mb30">程序最大执行时间</p>
+<!--  <p class="color-grey-6 font-16 mb30">程序最大执行时间</p>-->
-  <div class="padding10-20 edu-back-greyf5 radius4 font-16 fl">
+<!--  <div class="padding10-20 edu-back-greyf5 radius4 font-16 fl">-->
-    <%= @shixun.exec_time %>秒
+<!--    <%#= @shixun.exec_time %>秒-->
-  </div>
+<!--  </div>-->
-</div>
+<!--</div>-->
 
 
 <div class="edu-back-white mb10 padding40-20">