Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

# Conflicts:
#	public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

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

@@ -702,7 +702,9 @@ submittojoinclass=(value)=>{
                 {/*<input type="text" className="search-input fl" id="search-input" */}
                   {/*onKeyDown={this.onKeywordSearchKeyDown} name="search_keyword" placeholder="搜索实训项目"/>*/}
 
-                <div className={"HeaderSearch"}>
+                <div className={"HeaderSearch"}
+										 style={{display: 'none'}}
+								>
                   <Search
                     placeholder="实践课程/翻转课堂/开发社区/交流问答"
                     // onSearch={value => console.log(value)}
@@ -792,7 +794,7 @@ submittojoinclass=(value)=>{
 									{this.props.current_user&&this.props.current_user.user_identity==="学生"?"":<li><Link to={"/courses/new"}>新建课堂</Link></li>}
                   <li><a href="/shixuns/new">新建实训</a></li>
                   <li><a href={this.props.Headertop===undefined?"":"/paths/new"}>新建实践课程</a></li>
-                  <li><a href={this.props.Headertop===undefined?"":this.props.Headertop.new_project_url} target="_blank">新建项目</a></li>
+                  <li><a href={"/projects/new"} target="_blank">新建项目</a></li>
                 </ul>
                 <ul className="fl with50 edu-txt-center">