Merge remote-tracking branch 'origin/topic_bank' into topic_bank

public/react/src/modules/courses/exercise/ExerciseNewCommon.js

@@ -436,6 +436,7 @@ class ExerciseNewCommon extends Component{
 
       getAddQuestionUrl: this.getAddQuestionUrl,
       getEditQuestionUrl: this.getEditQuestionUrl,
+      exercise_url: this.props.exercise_url,
     }
     return(
         <React.Fragment>

public/react/src/modules/courses/exercise/new/ShixunEditor.js

@@ -156,10 +156,10 @@ class ShixunEditor extends Component{
     this.props.onEditorCancel()
   }
   componentDidMount = () => {
-    const { shixun_id } = this.props;
+    const { shixun_id, exercise_url } = this.props;
     // shixun_id
     const Id = this.props.match.params.Id  
-    const url = `/exercises/${Id}/commit_shixun.json`
+    const url = `/${exercise_url || 'exercises'}/${Id}/commit_shixun.json`
     axios.get(url, {
         params: {
             shixun_id

public/react/src/modules/user/usersInfo/banks/banksMenu.js

@@ -111,7 +111,7 @@ class BanksMenu extends Component{
     // console.log("banksMenubanksMenubanksMenubanksMenu");
     // console.log(banksMenu);
     return(
-      <div className="clearfix bor-bottom-greyE edu-back-white" style={{padding:"2px 30px"}}>
+      <div className="clearfix bor-bottom-greyE edu-back-white" style={{padding:"0px 30px"}}>
         {this.state.Modalstype&&this.state.Modalstype===true?<Modals
           modalsType={this.state.Modalstype}
           modalsTopval={this.state.Modalstopval}