Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder

app/views/layouts/_footer.html.erb

@@ -1,6 +1,10 @@
 <div class="newFooter edu-txt-center">    <!-- 底部导航栏 -->
   <div class="inner-footer_con">
     <div class="footercon">
+<!--      <div class="inline mt40">-->
+        <%#= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台" , width: "70px"), home_path,:class => "fl",:style => "height:70px" %>
+<!--        <span class="fl color-grey-c cdefault font-28 ml30" style="line-height:74px">EduCoder.NET</span>-->
+<!--      </div>-->
       <ul class="clearfix inner-footernav">
         <li><a href="<%= home_path %>" class="fl">网站首页</a></li>
         <li><a href="<%= help_path(:index => 1) %>" class="fl">关于我们</a></li>