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

public/react/src/modules/tpm/TPMDataset.js

@@ -463,13 +463,13 @@ debugger
 		return (
 			<React.Fragment>
 				<div className="tpmComment educontent clearfix mt30 mb80">
-					{
-						this.state.showmodel===true?
-							<Tpmdatasetmodel modalCancel={this.ModalSave()} tittest={this.state.tittest}  modalsType={this.state.showmodel}></Tpmdatasetmodel>
-							:""
-					}
-					<div className="with65 fl edu-back-white commentsDelegateParent">
 
+					<div className="with65 fl edu-back-white commentsDelegateParent">
+						{
+							this.state.showmodel===true?
+								<Tpmdatasetmodel modalCancel={this.ModalSave()} tittest={this.state.tittest}  modalsType={this.state.showmodel}></Tpmdatasetmodel>
+								:""
+						}
 						<TPMNav
 							match={match}
 							user={user}