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

Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_item_bank

Browse Source
dev_jupyter
杨树林 5 years ago
parent 9755504c9c 21d1918313
commit 10c3b23bb4
9 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File

9
app/controllers/shixuns_controller.rb
Unescape View File

@ -893,7 +893,8 @@ class ShixunsController < ApplicationController
content = upload_file.tempfile.read content = upload_file.tempfile.read
author_name = current_user.real_name author_name = current_user.real_name
author_email = current_user.git_mail author_email = current_user.git_mail
update_file_content(content, @repo_path, @path, author_email, author_name, "upload file by browser") message = params[:message] || "upload file by browser"
update_file_content(content, @repo_path, @path, author_email, author_name, message)
render_ok render_ok
end end
@ -901,14 +902,16 @@ class ShixunsController < ApplicationController
def upload_git_folder def upload_git_folder
author_name = current_user.real_name author_name = current_user.real_name
author_email = current_user.git_mail author_email = current_user.git_mail
git_add_folder(@path, author_name, author_email, "upload folder by browser") message = params[:message] || "upload folder by browser"
git_add_folder(@path, author_name, author_email, message)
render_ok render_ok
end end
def delete_git_file def delete_git_file
author_name = current_user.real_name author_name = current_user.real_name
author_email = current_user.git_mail author_email = current_user.git_mail
git_delete_file(@path, author_name, author_email, "delete filer by browser") message = params[:message] || "delete file by browser"
git_delete_file(@path, author_name, author_email, message)
render_ok render_ok
end end

2
public/react/public/css/edu-all.css
Unescape View File

@ -174,7 +174,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
.user_navlist_white a:hover{color: #4cacff} .user_navlist_white a:hover{color: #4cacff}
.headIcon{height: 100%;box-sizing: border-box; margin: 0px!important;} .headIcon{height: 100%;box-sizing: border-box; margin: 0px!important;}
.black_nav_list{padding: 4px 0px;box-sizing: border-box;height: 100%;} .black_nav_list{padding: 4px 0px;box-sizing: border-box;height: 100%;}
.black_nav_list li{line-height: 42px;height: 42px;color: #fff;cursor: pointer;} .black_nav_list li{line-height: 40px;height: 40px;color: #fff;cursor: pointer;}
.black_nav_span{display: block;margin:0px 20px;border-bottom: 1px solid #4B4B4B;padding-left: 8px;color: #FAFAFA} .black_nav_span{display: block;margin:0px 20px;border-bottom: 1px solid #4B4B4B;padding-left: 8px;color: #FAFAFA}
.welcome_shixun_index:last-child .black_nav_span{border-bottom: none} .welcome_shixun_index:last-child .black_nav_span{border-bottom: none}
.black_nav_list li:hover{background: #fff;} .black_nav_list li:hover{background: #fff;}

4
public/react/src/modules/courses/exercise/new/SingleDisplay.js
Unescape View File

@ -102,7 +102,7 @@ class SingleDisplay extends Component{
display: "flex", display: "flex",
flexDirection:"row", flexDirection:"row",
}} key={optionIndex}> }} key={optionIndex}>
<Radio disabled className="fl lineh-25" checked={item.standard_boolean}>{prefix}</Radio> <Radio disabled className="fl lineh-25 w50" checked={item.standard_boolean}>{prefix}</Radio>
<MarkdownToHtml content={item.choice_text} selector={'single_' + (index + 1) + '' + (optionIndex + 1)} style={{ float: 'left', display: 'inline-block' }} <MarkdownToHtml content={item.choice_text} selector={'single_' + (index + 1) + '' + (optionIndex + 1)} style={{ float: 'left', display: 'inline-block' }}
></MarkdownToHtml> ></MarkdownToHtml>
@ -116,7 +116,7 @@ class SingleDisplay extends Component{
display: "flex", display: "flex",
flexDirection:"row", flexDirection:"row",
}} key={optionIndex}> }} key={optionIndex}>
<Checkbox disabled className="fl lineh-25 mr8" checked={item.standard_boolean}>{prefix}</Checkbox> <Checkbox disabled className="fl lineh-25 w50" checked={item.standard_boolean}>{prefix}</Checkbox>
<MarkdownToHtml content={item.choice_text} selector={'single_' + (index + 1)+ '' + (optionIndex + 1)} style={{ float: 'left', display: 'inline-block' }} <MarkdownToHtml content={item.choice_text} selector={'single_' + (index + 1)+ '' + (optionIndex + 1)} style={{ float: 'left', display: 'inline-block' }}
></MarkdownToHtml> ></MarkdownToHtml>

18
public/react/src/modules/page/MainContent.js
Unescape View File

@ -14,9 +14,11 @@ import ChooseEvaluateView from './main/ChooseEvaluateView'
import { CircularProgress } from 'material-ui/Progress'; import { CircularProgress } from 'material-ui/Progress';
import Button from 'material-ui/Button'; import Button from 'material-ui/Button';
import VNCContainer from './VNCContainer' import VNCContainer from './VNCContainer'
import { connect } from 'react-redux';
import './tpiPage.css'; import './tpiPage.css';
import './tpiPageForMobile.css'; import './tpiPageForMobile.css';
import actions from '../../redux/actions';
const $ = window.$; const $ = window.$;
class MainContent extends Component { class MainContent extends Component {
componentDidMount() { componentDidMount() {
@ -32,11 +34,15 @@ class MainContent extends Component {
// console.log('onResizeButtonClick') // console.log('onResizeButtonClick')
} }
onRunCodeTest = () => { onRunCodeTest = () => {
const {onRunCodeTest, isCollpaseTsetCase} = this.props;
const vncContainer = this.refs['vncContainer'] const vncContainer = this.refs['vncContainer']
if (vncContainer) { if (vncContainer) {
vncContainer.showCodeEvaluate && vncContainer.showCodeEvaluate() vncContainer.showCodeEvaluate && vncContainer.showCodeEvaluate()
} }
this.props.onRunCodeTest(); // console.log('1111111111');
// this.props.onRunCodeTest();
isCollpaseTsetCase(true);
onRunCodeTest();
} }
hideCodeEvaluate = () => { hideCodeEvaluate = () => {
const vncContainer = this.refs['vncContainer'] const vncContainer = this.refs['vncContainer']
@ -195,4 +201,12 @@ class MainContent extends Component {
} }
} }
export default MainContent; const mapStateToProps = (state) => ({});
const mapDispatchToProps = (dispatch) => ({
isCollpaseTsetCase: (flag) => dispatch(actions.isCollpaseTsetCase(flag))
});
export default connect(
mapStateToProps,
mapDispatchToProps
)(MainContent);

2
public/react/src/modules/page/VNCDisplay.js
Unescape View File

@ -168,7 +168,7 @@ class VNCDisplay extends Component {
<div id="status">Loading</div> <div id="status">Loading</div>
<div id="sendCtrlAltDelButton">Send CtrlAltDel</div> <div id="sendCtrlAltDelButton">Send CtrlAltDel</div>
</div> </div>
<div id="screen" style={{ height: 'calc(100vh - 105px)' }}> <div id="screen" style={{ height: 'calc(100vh - 140px)' }}>
</div> </div>
{this.props.children} {this.props.children}

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

@ -1039,17 +1039,17 @@ submittojoinclass=(value)=>{
` `
} }
</style> </style>
<li className={`pr `}> {/*<li className={`pr `}>*/}
<Popover placement="bottom" content={contents} trigger="click" > {/* <Popover placement="bottom" content={contents} trigger="click" >*/}
<div className=" sortinxdirection mr10"> {/* <div className=" sortinxdirection mr10">*/}
<div style={{ {/* <div style={{*/}
color:"#fff" {/* color:"#fff"*/}
}}> {/* }}>*/}
题库 {/* 题库*/}
</div> {/* </div>*/}
</div> {/* </div>*/}
</Popover> {/* </Popover>*/}
</li> {/*</li>*/}

6
public/react/src/modules/tpm/TPMIndexHOC.js
Unescape View File

@ -35,14 +35,14 @@ if (!window['indexHOCLoaded']) {
// $('head').append($('<link rel="stylesheet" type="text/css" />') // $('head').append($('<link rel="stylesheet" type="text/css" />')
// .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`)); // .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`));
$('head').append($('<link rel="stylesheet" type="text/css" />') $('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/css/edu-common.css?2020`)); .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?2021`));
$('head').append($('<link rel="stylesheet" type="text/css" />') $('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?2020`)); .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?2021`));
// index.html有加载 // index.html有加载
$('head').append($('<link rel="stylesheet" type="text/css" />') $('head').append($('<link rel="stylesheet" type="text/css" />')
.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?2020`)); .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?2021`));
// $('head').append($('<link rel="stylesheet" type="text/css" />') // $('head').append($('<link rel="stylesheet" type="text/css" />')

2
public/react/src/modules/tpm/shixuns/ShixunSearchBar.js
Unescape View File

@ -237,7 +237,7 @@ render() {
{ {
shixunhoverData.map((item,key)=>{ shixunhoverData.map((item,key)=>{
return( return(
<Dropdown overlay={overlaymenu(item.sub_repertoires,item.id)} key={key} > <Dropdown overlay={overlaymenu(item.sub_repertoires,item.id)} key={key} placement= {item.id<4?"bottomRight":item.id>=8?"bottomLeft":"bottomCenter"}>
<li key={key} className={parseInt(shixunsearchAllvalue)===item.id?"shaiItem shixun_repertoire active":"shaiItem shixun_repertoire"} value={item.id} onClick={this.shixunsearchAll}> <li key={key} className={parseInt(shixunsearchAllvalue)===item.id?"shaiItem shixun_repertoire active":"shaiItem shixun_repertoire"} value={item.id} onClick={this.shixunsearchAll}>
{item.name} {item.name}
</li> </li>

2
public/stylesheets/educoder/edu-all.css
Unescape View File

@ -178,7 +178,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
.user_navlist_white a:hover{color: #4cacff} .user_navlist_white a:hover{color: #4cacff}
.headIcon{height: 100%;box-sizing: border-box; margin: 0px!important;} .headIcon{height: 100%;box-sizing: border-box; margin: 0px!important;}
.black_nav_list{padding: 4px 0px;box-sizing: border-box;height: 100%;} .black_nav_list{padding: 4px 0px;box-sizing: border-box;height: 100%;}
.black_nav_list li{line-height: 42px;height: 42px;color: #fff;cursor: pointer;} .black_nav_list li{line-height: 40px;height: 40px;color: #fff;cursor: pointer;}
.black_nav_span{display: block;margin:0px 20px;border-bottom: 1px solid #4B4B4B;padding-left: 8px;color: #FAFAFA} .black_nav_span{display: block;margin:0px 20px;border-bottom: 1px solid #4B4B4B;padding-left: 8px;color: #FAFAFA}
.welcome_shixun_index:last-child .black_nav_span{border-bottom: none} .welcome_shixun_index:last-child .black_nav_span{border-bottom: none}
.black_nav_list li:hover{background: #fff;} .black_nav_list li:hover{background: #fff;}

Write Preview
Loading…
Cancel
Save