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

dev_aliyun
杨树明 5 years ago
commit e194844bc2

@ -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="educontent">
<div class="head-nav pr"> <div class="head-nav pr">

@ -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"> <div class="educontent">
@ -69,12 +69,12 @@
<div class="edu-menu-list" style="top:60px;width: 240px;"> <div class="edu-menu-list" style="top:60px;width: 240px;">
<div class="overPart"></div> <div class="overPart"></div>
<ul class="fl with50 edu-txt-center pr ul-leftline"> <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>
<ul class="fl with50 edu-txt-center"> <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>--> <!-- <li><%#= link_to "加入项目", applied_join_project_path, :remote => true %></li>-->
</ul> </ul>
</div> </div>

Loading…
Cancel
Save