Merge branches 'develop' and 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder

app/views/competitions/_header.html.erb

@@ -1,5 +1,9 @@
-<div id="competition-header" class="edu-txt-right">
+<div id="competition-header" class="clearfix">
-  <div class="inline">
+  <a href="/" style="margin: 10px 20px; display: inline-block;">
+    <img alt="高校智能化教学与实训平台" class="logoimg" 
+          src="/images/educoder/headNavLogo.png?1526520218" style="width:40px">
+  </a>
+  <div class="inline fr">
     <ul class="nav-game fl">
       <% @competition.competition_modules.where(:hidden => 0).each do |com_module| %>
         <% case com_module.name %>

public/react/src/modules/tpm/NewHeader.js

@@ -467,14 +467,14 @@ class NewHeader extends Component {
                             <ul className="fl with50 edu-txt-center">
                                 <li>
                                     {isLogin?
-                                        <a href="/courses/join_private_courses" data-remote="true">加入课堂</a>:
+                                        <a href="/welcome/join_private_courses" data-remote="true">加入课堂</a>:
                                         <a href="/login" data-remote="true">加入课堂</a>
                                        }
 
                                 </li>
-                                <li>
+                                {/* <li>
                                     <a href="/applied_project/applied_join" data-remote="true">加入项目</a>
-                                </li>
+                                </li> */}
                             </ul>
 				      	</div>
 				    </div>