Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

public/react/src/modules/comment/CommentItemMDEditor.css

@@ -24,6 +24,22 @@
 
 .panel-comment_item .editor__resize {
 	transform: translateX(-2%);
+
+	position: absolute;
+	width: 120px;
+	height: 4px;
+	left: 54%;
+	transform: translateX(-50%);
+	margin-top: 2px;
+	border-top: 1px solid #ccc;
+	border-bottom: 1px solid #ccc;
+	cursor: row-resize;
+	text-indent: 110%;
+	white-space: nowrap;
+	overflow: hidden;
+	text-transform: capitalize;
+	
+	box-sizing: border-box;
 }
 
 /*帖子回復按鈕*/
@@ -31,6 +47,11 @@ a.commentsbtn.task-btn-blue {
 	background: #4CACFF !important;
 }
 
+.commentTab a.commentsbtn.task-btn-blue {
+	margin-right: 22px;
+    margin-top: 6px;
+}
+
 
 .editormd-grid-table-row a.editormd-emoji-btn.selected {
 	border-bottom: 2px solid #4CACFF!important;

public/react/src/modules/courses/members/teacherList.js

@@ -65,7 +65,7 @@ function buildColumns(that) {
     sorter: showSorter,
     sortOrder: sortedInfo.columnKey === 'name' && sortedInfo.order,
     render: (name, record) => {
-      return <a href={`/login/${record.login}`} target="_blank" className="overflowHidden1" style={{ maxWidth: '110px'}} 
+      return <a href={`/users/${record.login}`} target="_blank" className="overflowHidden1" style={{ maxWidth: '110px'}} 
           title={`${name.length > 4 ? name : ''}`}>{name}</a>
     }
   }, {

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -913,9 +913,9 @@ class Listofworksstudentone extends Component {
 
 	}
 	componentWillReceiveProps(nextProps) {
-		// console.log("+++++++++916");
+		console.log("+++++++++916");
-		// console.log(nextProps);
+		console.log(nextProps);
-		// console.log(this.props)
+		console.log(this.props)
 		// console.log(this.props.isAdmin());
 		if (nextProps.code_review != this.props.code_review) {
 			if (nextProps.code_review !== undefined) {

public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js

@@ -373,7 +373,7 @@ class ShixunhomeWorkItem extends Component{
 								   width:192px !important;
 								 }
 							   .homepagePostSettingbox{
-								   width:121px !important;
+								   width:139px !important;
 								 }
 								`
 							}
@@ -381,7 +381,8 @@ class ShixunhomeWorkItem extends Component{
             {this.props.isAdmin?<div className={this.props.isAdminOrCreator()?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"44px","display":"block"}}>
               <a className="btn colorblue font-16" href={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>实训详情</a>
 								{this.props.isAdminOrCreator()?<a  onClick={()=>this.editname(discussMessage.name,discussMessage.homework_id)} className={"btn colorblue ml20 font-16"}>重命名</a>:""}
-              <WordsBtn className="btn colorblue ml20 font-16"  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>
+              {/*<WordsBtn className="btn colorblue ml20 font-16"  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>*/}
+              <WordsBtn className="btn colorblue  font-16"  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>
             </div>:""}
 
 

public/react/src/modules/page/main/LeftView.js

@@ -336,7 +336,7 @@ class LeftView extends Component {
 								  	</div>
 								</div>
 					    	</div>
-					    	<div id="tab_con_4" className="tab-info commentsDelegateParent" style={ tabIndex === 3 ? {display: 'block'} : {display: 'none'} }>
+					    	<div id="tab_con_4" className="commentTab tab-info commentsDelegateParent" style={ tabIndex === 3 ? {display: 'block'} : {display: 'none'} }>
 					    		{ loadingComments ? 
 							    	<CircularProgress size={40} thickness={3} style={{ marginLeft: 'auto', marginRight: 'auto', marginTop: '40%', display: 'block' }}/> : 
 						    		<CommentContainer {...this.props}></CommentContainer>

public/react/src/modules/user/usersInfo/InfosCourse.js

@@ -103,7 +103,7 @@ class InfosCourse extends Component{
     } = this.state;
     let  is_current=this.props.is_current;
 
-    // console.log(this.props.current_user&&this.props.current_user.user_identity==="学生")
+      console.log(this.props.current_user&&this.props.current_user.user_identity==="学生")
     return(
       <div className="educontent">
         <Spin size="large" spinning={isSpin}>