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

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

@@ -1224,7 +1224,7 @@ class TPMBanner extends Component {
 
 
                 {this.props.identity < 8 && shixunsDetails.shixun_status != -1 && shixunsDetails.shixun_status != 0?
-                  <div className="fr user_default_btn user_blue_btn mr20"
+                  <div className="fr kaike kkbth mr20"
                        style={{display: shixunsDetails.can_copy === false || shixunsDetails.can_copy === null ? "none" : "flex"}}>
                     <Tooltip placement="bottom" title={"基于这个实训修改形成新的实训"}>
                        <span className="flex1 edu-txt-center fl font-18"
@@ -1278,7 +1278,7 @@ class TPMBanner extends Component {
                       </div>
                     </Modal>
                     {!!shixunsDetails.fork_num &&
-                    <Link to={"/shixuns/" + shixunId + "/fork_list"} className="forkNum" data-tip-down="Fork实训列表">
+                    <Link to={"/shixuns/" + shixunId + "/fork_list"} className="forkNumst" data-tip-down="Fork实训列表">
                       {shixunsDetails.fork_num}
                     </Link>
                     }

public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js

@@ -634,7 +634,7 @@ class Collaborators extends Component {
 
                                         <p className="color-grey-B2 font-12 mb10 sortinxdirection mt14">
 																					<p className="yslwushiwidth90 sortinxdirection">
-																						<p className="mr20 font-16 w70">{item.user.identity}</p>
+																						<p className={item.user.identity===null||item.user.identity===undefined||item.user.identity===""?" font-16 ":"mr20 font-16 w70"}>{item.user.identity}</p>
 																						<p className={item.user.school_name===null||item.user.school_name===""?"":"mr40 font-16 maxnamewidth150"}>{item.user.school_name}</p>
 																						<p className="fabushixunwidth">发布实训项目&nbsp;&nbsp;<span className="fabushixunwidthcolor ml2">{item.user.user_shixuns_count}</span></p>
 																					</p>

public/react/src/modules/tpm/shixuns/css/TPMBanner.css

@@ -156,3 +156,4 @@ a:active{text-decoration:none;}
     box-sizing: border-box;
     color: #ffffff !important;
 }
+.forkNumst{display: block;float: left;width: 36px;text-align: center;border-left: 1px solid #ffffff !important;color: #ffffff!important; }