diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 7b3cb7588..f86ade58f 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -893,7 +893,8 @@ class ShixunsController < ApplicationController content = upload_file.tempfile.read author_name = current_user.real_name 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 end @@ -901,14 +902,16 @@ class ShixunsController < ApplicationController def upload_git_folder author_name = current_user.real_name 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 end def delete_git_file author_name = current_user.real_name 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 end diff --git a/public/react/public/css/edu-all.css b/public/react/public/css/edu-all.css index 66adaf482..061cee521 100644 --- a/public/react/public/css/edu-all.css +++ b/public/react/public/css/edu-all.css @@ -174,7 +174,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px} .user_navlist_white a:hover{color: #4cacff} .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 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} .welcome_shixun_index:last-child .black_nav_span{border-bottom: none} .black_nav_list li:hover{background: #fff;} diff --git a/public/react/src/modules/courses/exercise/new/SingleDisplay.js b/public/react/src/modules/courses/exercise/new/SingleDisplay.js index 4b8d9ee95..6b84df8ce 100644 --- a/public/react/src/modules/courses/exercise/new/SingleDisplay.js +++ b/public/react/src/modules/courses/exercise/new/SingleDisplay.js @@ -102,7 +102,7 @@ class SingleDisplay extends Component{ display: "flex", flexDirection:"row", }} key={optionIndex}> - {prefix} + {prefix} @@ -116,7 +116,7 @@ class SingleDisplay extends Component{ display: "flex", flexDirection:"row", }} key={optionIndex}> - {prefix} + {prefix} diff --git a/public/react/src/modules/page/MainContent.js b/public/react/src/modules/page/MainContent.js index 175ea7bc0..282f65e78 100644 --- a/public/react/src/modules/page/MainContent.js +++ b/public/react/src/modules/page/MainContent.js @@ -14,9 +14,11 @@ import ChooseEvaluateView from './main/ChooseEvaluateView' import { CircularProgress } from 'material-ui/Progress'; import Button from 'material-ui/Button'; import VNCContainer from './VNCContainer' +import { connect } from 'react-redux'; import './tpiPage.css'; import './tpiPageForMobile.css'; +import actions from '../../redux/actions'; const $ = window.$; class MainContent extends Component { componentDidMount() { @@ -32,11 +34,15 @@ class MainContent extends Component { // console.log('onResizeButtonClick') } onRunCodeTest = () => { + const {onRunCodeTest, isCollpaseTsetCase} = this.props; const vncContainer = this.refs['vncContainer'] if (vncContainer) { vncContainer.showCodeEvaluate && vncContainer.showCodeEvaluate() } - this.props.onRunCodeTest(); + // console.log('1111111111'); + // this.props.onRunCodeTest(); + isCollpaseTsetCase(true); + onRunCodeTest(); } hideCodeEvaluate = () => { 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); diff --git a/public/react/src/modules/page/VNCDisplay.js b/public/react/src/modules/page/VNCDisplay.js index 98c4cb5e7..b9ec77988 100644 --- a/public/react/src/modules/page/VNCDisplay.js +++ b/public/react/src/modules/page/VNCDisplay.js @@ -168,7 +168,7 @@ class VNCDisplay extends Component {
Loading
Send CtrlAltDel
-
+
{this.props.children} diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index fabe180bf..5884eb4ef 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -1039,17 +1039,17 @@ submittojoinclass=(value)=>{ ` } -
  • - -
    -
    - 题库 -
    -
    -     -
    • + {/*
  • */} + {/* */} + {/*
    */} + {/*
    */} + {/* 题库*/} + {/*
    */} + {/*
    */} + {/*     */} + {/*
    • */} diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js index e44dac83b..4116aef3a 100644 --- a/public/react/src/modules/tpm/TPMIndexHOC.js +++ b/public/react/src/modules/tpm/TPMIndexHOC.js @@ -35,14 +35,14 @@ if (!window['indexHOCLoaded']) { // $('head').append($('') // .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`)); $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?2020`)); + .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?2021`)); $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?2020`)); + .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?2021`)); // index.html有加载 $('head').append($('') - .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?2020`)); + .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?2021`)); // $('head').append($('') diff --git a/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js b/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js index 1a23bd94e..b884d7bf0 100644 --- a/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js +++ b/public/react/src/modules/tpm/shixuns/ShixunSearchBar.js @@ -237,7 +237,7 @@ render() { { shixunhoverData.map((item,key)=>{ return( - + =8?"bottomLeft":"bottomCenter"}>
  • {item.name}
    • diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 8be6e00ab..b596b6c15 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -178,7 +178,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px} .user_navlist_white a:hover{color: #4cacff} .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 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} .welcome_shixun_index:last-child .black_nav_span{border-bottom: none} .black_nav_list li:hover{background: #fff;}