Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/views/layouts/_logined_header.html.erb

@@ -1,4 +1,4 @@
-<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg ml20 fl"), home_path %>
+<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg fl"), home_path %>
 <div class="educontent">
 
   <div class="head-nav pr">

app/views/layouts/_unlogin_header.html.erb

@@ -1,5 +1,5 @@
 
-<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg ml20 fl"), home_path %>
+<%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台", class:"logoimg fl"), home_path %>
 
 <div class="educontent">
 
@@ -69,12 +69,12 @@
       <div class="edu-menu-list" style="top:60px;width: 240px;">
         <div class="overPart"></div>
         <ul class="fl with50 edu-txt-center pr ul-leftline">
-          <li><%= link_to "新建实训", signin_path, :remote => true %></li>
+          <li><%= link_to "新建实训", signin_path %></li>
-          <li><%= link_to "新建实践课程", signin_path, :remote => true %></li>
+          <li><%= link_to "新建实践课程", signin_path %></li>
-          <li><%= link_to "新建项目", signin_path, :remote => true %></li>
+          <li><%= link_to "新建项目", signin_path %></li>
         </ul>
         <ul class="fl with50 edu-txt-center">
-          <li><%= link_to "加入课堂", signin_path, :remote => true %></li>
+          <li><%= link_to "加入课堂", signin_path %></li>
 <!--          <li><%#= link_to "加入项目", applied_join_project_path, :remote => true %></li>-->
         </ul>
       </div>