m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

合并阿里云 造成隐藏又显示 处理

Browse Source
dev_local_2
杨树林 6 years ago
parent 9ef0d41a34
commit 4ab5811e2a
3 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File

60
public/react/src/modules/tpm/NewHeader.js
Unescape View File

@ -739,37 +739,37 @@ submittojoinclass=(value)=>{
</img>
</li>
<li className="fl edu-menu-panel careershover "
style={{display: this.props.Headertop === undefined ?'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}>
<a>职业路径</a>
<div
style={{display: this.props.Headertop === undefined ?'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}>
<ul className="edu-menu-list edu-menu-listnew " style={{top:'60px'}}>
{this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => {
return(
<li key={key}><i className="iconfont icon-java left careersiconfont"
style={{color: '#000 important'}}
></i><a style={{width: '83%'}}
href={item.url}>{item.name}</a></li>
)
})
}
</ul>
</div>
</li>
{/*// <li className="fl edu-menu-panel careershover "*/}
{/*// style={{display: this.props.Headertop === undefined ?'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}>*/}
{/*// <a>职业路径</a>*/}
{/*// <div*/}
{/*// style={{display: this.props.Headertop === undefined ?'none' : this.props.Headertop.career_url.length > 0 ? 'block' : 'none'}}>*/}
{/*// <ul className="edu-menu-list edu-menu-listnew " style={{top:'60px'}}>*/}
{/*// {this.props.Headertop === undefined ? "" : this.props.Headertop.career_url.map((item, key) => {*/}
{/*// return(*/}
{/*// <li key={key}><i className="iconfont icon-java left careersiconfont"*/}
{/*// style={{color: '#000 important'}}*/}
{/*// ></i><a style={{width: '83%'}}*/}
{/*// href={item.url}>{item.name}</a></li>*/}
{/* )*/}
{/* })*/}
{/* }*/}
{/* </ul>*/}
{/* </div>*/}
{/*</li>*/}
{/*<li className=""><a href={"/libraries"}>教学案例</a></li>*/}
<li className="">
<a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a>
<img className="roundedRectangles"
src={require('./roundedRectangle.png')}
/>
</li>
<li className={`${activeMoopCases === true ? 'pr active' : 'pr'}`}> <Link to={`/moop_cases`}>教学案例</Link></li>
{/*<li className="">*/}
{/* <a href={this.props.Headertop===undefined?"":this.props.Headertop.competitions_url}>在线竞赛</a>*/}
{/* <img className="roundedRectangles"*/}
{/* src={require('./roundedRectangle.png')}*/}
{/* />*/}
{/*</li>*/}
{/*<li className={`${activeMoopCases === true ? 'pr active' : 'pr'}`}> <Link to={`/moop_cases`}>教学案例</Link></li>*/}
{/*<li className={`${activePackages === true ? 'pr active' : 'pr'}`}>*/}
{/*<Link to={'/crowdsourcing'}>众包创新</Link>*/}
{/*</li>*/}
<li className={`${activeForums === true ? 'active' : ''}`}> <Link to={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</Link></li>
{/*<li className={`${activeForums === true ? 'active' : ''}`}> <Link to={this.props.Headertop===undefined?"":this.props.Headertop.topic_url}>交流问答</Link></li>*/}
<li
style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.auth===null? 'none' : 'block'}}
><a href={this.props.Headertop===undefined?"":this.props.Headertop.auth}>工程认证</a></li>
@ -912,7 +912,7 @@ submittojoinclass=(value)=>{
{this.props.Headertop===undefined?"":
<li><a onClick={(url)=>this.getUser("/paths/new")} >新建实践课程</a></li>
}
<li><a onClick={(url)=>this.getUser("/projects/new")} target="_blank">新建开发项目</a></li>
{/*<li><a onClick={(url)=>this.getUser("/projects/new")} target="_blank">新建开发项目</a></li>*/}
</ul>
<ul className="fl with50 edu-txt-center">
@ -929,9 +929,9 @@ submittojoinclass=(value)=>{
{/* /courses/join_course_multi_role */}
<li>
<a onClick={this.tojoinitem}>加入开发项目</a>
</li>
{/*<li>*/}
{/*<a onClick={this.tojoinitem}>加入开发项目</a>*/}
{/*</li>*/}
{tojoinitemtype===true?<Modal
keyboard={false}
title="加入项目"

22
public/react/src/modules/user/usersInfo/InfosBanner.js
Unescape View File

@ -106,22 +106,22 @@ class InfosBanner extends Component{
onClick={() => this.setState({moduleName: 'paths'})}
to={`/users/${username}/paths`}>实践课程</Link>
</li>
<li className={`${moduleName == 'projects' ? 'active' : '' }`}>
<Link
onClick={() => this.setState({moduleName: 'projects'})}
to={`/users/${username}/projects`}>开发项目</Link>
</li>
{/*<li className={`${moduleName == 'projects' ? 'active' : '' }`}>*/}
{/* <Link*/}
{/* onClick={() => this.setState({moduleName: 'projects'})}*/}
{/* to={`/users/${username}/projects`}>开发项目</Link>*/}
{/*</li>*/}
{/*<li className={`${moduleName == 'package' ? 'active' : '' }`}>*/}
{/* <Link*/}
{/* onClick={() => this.setState({moduleName: 'package'})}*/}
{/* to={`/users/${username}/package`}>众包</Link>*/}
{/*</li>*/}
{((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
&& <li className={`${moduleName == 'videos' ? 'active' : '' }`}>
<Link
onClick={() => this.setState({moduleName: 'videos'})}
to={`/users/${username}/videos`}>视频</Link>
</li>}
{/*{((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin) */}
{/*&& <li className={`${moduleName == 'videos' ? 'active' : '' }`}>*/}
{/* <Link*/}
{/* onClick={() => this.setState({moduleName: 'videos'})}*/}
{/* to={`/users/${username}/videos`}>视频</Link>*/}
{/*</li>}*/}
{/*自己的主页且不是学生显示题库按钮*/}
{(is_current && current_user&& current_user.is_teacher )

2
public/react/src/modules/user/usersInfo/InfosProject.js
Unescape View File

@ -123,7 +123,7 @@ class InfosProject extends Component{
{/* 289 */}
{
page == 1 && is_current && this.props.current_user && !category && this.props.current_user.user_identity != "学生" ?
<Create href={`${this.props.Headertop && this.props.Headertop.old_url}/projects/new`} name={"新建开发项目"} index="4"></Create>:""
<Create href={`${this.props.Headertop && this.props.Headertop.old_url}/projects/new`} name={""} index="4"></Create>:""
}
{
(!data || (data && data.projects.length==0)) && category && <NoneData></NoneData>

Write Preview
Loading…
Cancel
Save