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

Merge branch 'dev_aliyun' into develop

Browse Source
dev_home
cxt 5 years ago
parent 15f7bcbbe7 e51117984d
commit 3f055011f3
11 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File

2
app/views/cooperative/laboratory_settings/edit.html.erb
Unescape View File

@ -145,7 +145,7 @@
</thead> </thead>
<tbody> <tbody>
<% (setting.navbar || setting.default_navbar).each do |nav| %> <% (setting.navbar || setting.default_navbar).each do |nav| %>
<tr> <tr style="<%= nav['name'] == '交流问答' ? 'display:none' : '' %>">
<td><%= text_field_tag('navbar[][name]', nav['name'], id: nil, class: 'form-control') %></td> <td><%= text_field_tag('navbar[][name]', nav['name'], id: nil, class: 'form-control') %></td>
<td><%= text_field_tag('navbar[][link]', nav['link'], id: nil, class: 'form-control') %></td> <td><%= text_field_tag('navbar[][link]', nav['link'], id: nil, class: 'form-control') %></td>
<td class="text-center"> <td class="text-center">

1
public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
Unescape View File

@ -78,7 +78,6 @@ class CompetitionsIndex extends Component{
height: 300px; height: 300px;
background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.competition_banner_url === null ?`images/educoder/competitions/courses.jpg`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.competition_banner_url)}); background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.competition_banner_url === null ?`images/educoder/competitions/courses.jpg`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.competition_banner_url)});
background-color: #081C4B; background-color: #081C4B;
background-size: cover;
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
} }

1
public/react/src/modules/competitions/Competitimain/Competitionsindex.css
Unescape View File

@ -153,7 +153,6 @@
.Competitionshead{ .Competitionshead{
background-color: #2d28ba !important; background-color: #2d28ba !important;
background-size: cover !important;
background-position: center !important; background-position: center !important;
background-position: 50% !important; background-position: 50% !important;
background-repeat: no-repeat !important; background-repeat: no-repeat !important;

2
public/react/src/modules/courses/Resource/index.js
Unescape View File

@ -827,7 +827,7 @@ class Fileslists extends Component{
{this.props.isAdmin()?<WordsBtn style="blue" onClick={()=>this.addDir()} className={"mr30 font-16"}>新建目录</WordsBtn>:""} {this.props.isAdmin()?<WordsBtn style="blue" onClick={()=>this.addDir()} className={"mr30 font-16"}>新建目录</WordsBtn>:""}
{this.props.isAdmin()?parseInt(this.props.match.params.main_id)!=parseInt(this.props.coursesids)?<WordsBtn style="blue" onClick={()=>this.editDir(name)} className={"mr30 font-16"}>目录重命名</WordsBtn>:"":""} {this.props.isAdmin()?parseInt(this.props.match.params.main_id)!=parseInt(this.props.coursesids)?<WordsBtn style="blue" onClick={()=>this.editDir(name)} className={"mr30 font-16"}>目录重命名</WordsBtn>:"":""}
{this.props.isAdmin()||this.props.isStudent() ? <WordsBtn style="blue" className="mr30 font-16" onClick={()=>this.addResource()}>选用资源</WordsBtn>:""} {this.props.isAdmin()||this.props.isStudent() ? this.props.user&&this.props.user.main_site===true? <WordsBtn style="blue" className="mr30 font-16" onClick={()=>this.addResource()}>选用资源</WordsBtn>:"":""}
{this.props.isAdmin()||this.props.isStudent() ? <WordsBtn style="blue" className=" font-16" onClick={()=>this.sendResources()}>上传资源</WordsBtn>:""} {this.props.isAdmin()||this.props.isStudent() ? <WordsBtn style="blue" className=" font-16" onClick={()=>this.sendResources()}>上传资源</WordsBtn>:""}
</React.Fragment> </React.Fragment>
} }

2
public/react/src/modules/courses/busyWork/CommonWorkSetting.js
Unescape View File

@ -1143,7 +1143,7 @@ class CommonWorkSetting extends Component{
rules={rules} rules={rules}
course_group={adaptered_group_settings} course_group={adaptered_group_settings}
rulesCheckInfo={(info)=>this.rulesCheckInfo(info)} rulesCheckInfo={(info)=>this.rulesCheckInfo(info)}
flagPageEdit={true} flagPageEdit={startEditFlag}
moduleName="作业" moduleName="作业"
></PollDetailTabForthRules> ></PollDetailTabForthRules>
} }

3
public/react/src/modules/courses/common/comments/CCommentItem.js
Unescape View File

@ -174,6 +174,7 @@ class CCommentItem extends Component{
// <div>{item.content} {item.user_info.user_name}</div> // <div>{item.content} {item.user_info.user_name}</div>
// src={getImageUrl(`images/${item.image_url}`)} // src={getImageUrl(`images/${item.image_url}`)}
const imgSrc = (!item.user_info.user_image_url || item.user_info.user_image_url === '--') ? `${getUrl()}/images/edu_user/anony.png` : item.user_info.user_image_url;
return ( return (
<div className="comment_item_cont appraise df clearfix" key={item.id}> <div className="comment_item_cont appraise df clearfix" key={item.id}>
<div className="J_Comment_Face fl"> <div className="J_Comment_Face fl">
@ -184,7 +185,7 @@ class CCommentItem extends Component{
</a> </a>
: <a href={`${_origin}/users/${item.user_info.user_login}`} target="_blank"> : <a href={`${_origin}/users/${item.user_info.user_login}`} target="_blank">
<img alt="用户头像" height="50" <img alt="用户头像" height="50"
src={`/images/${item.user_info.user_image_url}`} src={imgSrc}
width="50"/> width="50"/>
</a>} </a>}
</div> </div>

1
public/react/src/modules/courses/coursesHome/CoursesHome.js
Unescape View File

@ -119,7 +119,6 @@ class CoursesHome extends Component{
height: 300px; height: 300px;
background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.course_banner_url === null ?`images/educoder/competitions/courses.jpg`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.course_banner_url)}); background-image: url(${getImageUrl(this.props.mygetHelmetapi && this.props.mygetHelmetapi.course_banner_url === null ?`images/educoder/competitions/courses.jpg`:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.course_banner_url)});
background-color: #081C4B; background-color: #081C4B;
background-size: cover;
background-position: center; background-position: center;
background-repeat: no-repeat; background-repeat: no-repeat;
} }

2
public/react/src/modules/courses/exercise/yslexercisetable.css
Unescape View File

@ -58,5 +58,5 @@
.columnstwoachievement{ .columnstwoachievement{
width: 199px; width: 199px;
text-align: right !important; text-align: right !important;
padding-right: 60px !important; padding-right: 97px !important;
} }

13
public/react/src/modules/moop_cases/CaseList.js
Unescape View File

@ -98,7 +98,18 @@ class CaseList extends Component{
return( return(
<React.Fragment> <React.Fragment>
<img src={this.props.mygetHelmetapi&&this.props.mygetHelmetapi.moop_cases_banner_url===null?mainImg:getImageUrl(this.props.mygetHelmetapi&&this.props.mygetHelmetapi.moop_cases_banner_url)} width="100%" /> <style>
{
`
.imgmoop_cases{width: 100%;
height: 300px;
background-color: #000a4f;
background-position: 50%;
background-repeat: no-repeat;}
`
}
</style>
<img className={"imgmoop_cases"} src={this.props.mygetHelmetapi&&this.props.mygetHelmetapi.moop_cases_banner_url===null?mainImg:getImageUrl(this.props.mygetHelmetapi&&this.props.mygetHelmetapi.moop_cases_banner_url)}/>
<div className="educontent"> <div className="educontent">
<div className="edu-back-white mb30 mt30"> <div className="edu-back-white mb30 mt30">
<p className="padding20-30 clearfix bor-bottom-greyE"> <p className="padding20-30 clearfix bor-bottom-greyE">

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

@ -872,7 +872,6 @@ submittojoinclass=(value)=>{
} }
} }
// console.log("NewHeadergetHelmetapi432423423423");
// console.log(mygetHelmetapi2); // console.log(mygetHelmetapi2);
// console.log("NewHeadermygetHelmetapi123123123123"); // console.log("NewHeadermygetHelmetapi123123123123");
@ -1234,11 +1233,11 @@ submittojoinclass=(value)=>{
</a> </a>
<ul className="edu-menu-list" style={{top:'60px'}}> <ul className="edu-menu-list" style={{top:'60px'}}>
<span className="bor-bottom-greyE currentName task-hide">{user.username}</span> <span className="bor-bottom-greyE currentName task-hide">{user.username}</span>
<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/courses`}>我的翻转课堂</Link></li> {coursestypes===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/courses`}>我的翻转课堂</Link></li>}
{/* p 老师 l 学生 */} {/* p 老师 l 学生 */}
<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/shixuns`}>我的实训项目</Link></li> {shixuntype===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/shixuns`}>我的实训项目</Link></li>}
<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/paths`}>我的实践课程</Link></li> {pathstype===true?"":<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/paths`}>我的实践课程</Link></li>}
<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/projects`}>我的开发项目</Link></li> {this.props.user&&this.props.user.main_site===true?<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/projects`}>我的开发项目</Link></li>:""}
{/*<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/package`}>我的众包</Link></li>*/} {/*<li><Link to={`/users/${this.props.current_user===undefined?"":this.props.current_user.login}/package`}>我的众包</Link></li>*/}
<li style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.customer_management_url===null || this.props.Headertop.customer_management_url===""? 'none' : 'block'}}> <li style={{display: this.props.Headertop === undefined ? 'none' : this.props.Headertop.customer_management_url===null || this.props.Headertop.customer_management_url===""? 'none' : 'block'}}>
<a href={this.props.Headertop === undefined ? '' : this.props.Headertop.customer_management_url}>客户管理</a> <a href={this.props.Headertop === undefined ? '' : this.props.Headertop.customer_management_url}>客户管理</a>
@ -1290,7 +1289,7 @@ submittojoinclass=(value)=>{
{this.props.Headertop===undefined?"": {this.props.Headertop===undefined?"":
pathstype===true?"":<li><a onClick={(url)=>this.getUser("/paths/new")} >新建实践课程</a></li> pathstype===true?"":<li><a onClick={(url)=>this.getUser("/paths/new")} >新建实践课程</a></li>
} }
<li><a onClick={(url)=>this.getUser("/projects/new","projects")} target="_blank">新建开发项目</a></li> {this.props.user&&this.props.user.main_site===true?<li><a onClick={(url)=>this.getUser("/projects/new","projects")} target="_blank">新建开发项目</a></li>:""}
</ul> </ul>
<ul className="fl with50 edu-txt-center"> <ul className="fl with50 edu-txt-center">
@ -1307,9 +1306,9 @@ submittojoinclass=(value)=>{
{/* /courses/join_course_multi_role */} {/* /courses/join_course_multi_role */}
<li> {this.props.user&&this.props.user.main_site===true?<li>
<a onClick={this.tojoinitem}>加入开发项目</a> <a onClick={this.tojoinitem}>加入开发项目</a>
</li> </li>:""}
{tojoinitemtype===true?<Modal {tojoinitemtype===true?<Modal
keyboard={false} keyboard={false}
title="加入项目" title="加入项目"

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

@ -132,11 +132,11 @@ class InfosBanner extends Component{
onClick={() => this.setState({moduleName: 'paths'})} onClick={() => this.setState({moduleName: 'paths'})}
to={`/users/${username}/paths`}>实践课程</Link> to={`/users/${username}/paths`}>实践课程</Link>
</li>} </li>}
<li className={`${moduleName == 'projects' ? 'active' : '' }`}> {this.props.user&&this.props.user.main_site===true?<li className={`${moduleName == 'projects' ? 'active' : '' }`}>
<Link <Link
onClick={() => this.setState({moduleName: 'projects'})} onClick={() => this.setState({moduleName: 'projects'})}
to={`/users/${username}/projects`}>开发项目</Link> to={`/users/${username}/projects`}>开发项目</Link>
</li> </li>:""}
{/*<li className={`${moduleName == 'package' ? 'active' : '' }`}>*/} {/*<li className={`${moduleName == 'package' ? 'active' : '' }`}>*/}
{/* <Link*/} {/* <Link*/}
{/* onClick={() => this.setState({moduleName: 'package'})}*/} {/* onClick={() => this.setState({moduleName: 'package'})}*/}

Write Preview
Loading…
Cancel
Save