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

lib/tasks/public_message.rake

@@ -118,4 +118,19 @@ namespace :sync do
       large_time
     end
   end
+
+  task :board_count => :environment do
+    Course.find_each do |course|
+      puts course.id
+
+      begin
+        messages_count = Message.find_by_sql("select count(*) as count from messages where board_id in (select id from boards where course_id=#{course.id})").first.try(:count)
+
+        Board.update_column(messages_count: messages_count)
+      rescue
+
+      end
+
+    end
+  end
 end

public/react/src/modules/paths/PathDetail/DetailTop.js

@@ -324,16 +324,17 @@ class DetailTop extends Component{
 											border: 1px solid rgba(255,255,255,1);
 											color: #970084 !important;
 											font-size: 15px !important;
-											line-height: 37px !important;
+									    line-height: 36px !important;
 									}
 									.kkbths{
 									width:103px;
 									height:38px;
 									border-radius:4px;
+								  line-height: 36px !important;
 									border:1px solid rgba(255,255,255,1);
 									}
-									.maxwinth700{
+									.maxwinth600{
-									  max-width:700px;
+									  width:600px;
 									}
 									`
 								}
@@ -361,49 +362,46 @@ class DetailTop extends Component{
                   { detailInfoList.member_count!=0 ? <li><span>学习人数</span><span>{detailInfoList.member_count}</span></li> : ""}
                 </ul>
               }
-				    	<div className="fr pr maxwinth700">
+				    	<div className="fr pr maxwinth600">
 
 								{detailInfoList===undefined?"":detailInfoList.allow_statistics===true?
-										<Link to={"/paths/"+this.props.match.params.pathId+"/edit"} className="fl font-18 color-white kaike mr20 kkbths" >
+									<Link to={"/paths/"+this.props.match.params.pathId+"/statistics"}  className="user_default_btn fr font-18 xxtjbtn">
-													编辑
+									学习统计
-										</Link>
+									</Link>:""
-									:""
+									}
-								}
-
-                {detailInfoList===undefined?"":detailInfoList.allow_delete===true?<a
-                    className={"fl font-18 color-white kaike mr20 kkbths"}
-										onClick={this.allow_deletepath}
-                >删除</a>:""}
-
-                {
-                 detailInfoList.publish_status===0&&detailInfoList.allow_add_member===true?
-                  <a className="fl font-18 color-white kaike mr20 kkbths" onClick={this.applyissuePath}>申请发布</a>:""
-                }
-
 
-                {
+								{ detailInfoList.allow_send === true?this.props.courses===undefined?
-                  detailInfoList.publish_status===1 && detailInfoList.allow_statistics===true?
+									<SendPanel {...this.props} {...this.state}></SendPanel>:"":""
-                  <a className="fl font-18 color-white kaike mr20 kkbths" onClick={this.cancelissuePath}>撤销申请</a>:""
+								}
-                }
 
-                {
+								{this.props.courses===undefined?"":detailInfoList.is_creator===true?<a className={"fr font-18 color-white kaike mr20 kkbths"} onClick={()=>this.OpenCoursefun()}>开课</a>:""}
-                  detailInfoList.publish_status===2 && detailInfoList.allow_statistics===true?
-                  <a className="fl font-18 color-white kaike mr20 kkbths" onClick={this.reovkissuePath}>撤销发布</a>:""
-                }
 
+								{
+									detailInfoList.publish_status===2 && detailInfoList.allow_statistics===true?
+										<a className="fr font-18 color-white kaike mr20 kkbths" onClick={this.reovkissuePath}>撤销发布</a>:""
+								}
 
-								{this.props.courses===undefined?"":detailInfoList.is_creator===true?<a className={"fl font-18 color-white kaike mr20 kkbths"} onClick={()=>this.OpenCoursefun()}>开课</a>:""}
+								{
+									detailInfoList.publish_status===1 && detailInfoList.allow_statistics===true?
+										<a className="fr font-18 color-white kaike mr20 kkbths" onClick={this.cancelissuePath}>撤销申请</a>:""
+								}
 
-								{ detailInfoList.allow_send === true?this.props.courses===undefined?
+								{
-									<SendPanel {...this.props} {...this.state}></SendPanel>:"":""
+									detailInfoList.publish_status===0&&detailInfoList.allow_add_member===true?
+										<a className="fr font-18 color-white kaike mr20 kkbths" onClick={this.applyissuePath}>申请发布</a>:""
 								}
 
-								{detailInfoList===undefined?"":detailInfoList.allow_statistics===true?
+								{detailInfoList===undefined?"":detailInfoList.allow_delete===true?<a
-									<Link to={"/paths/"+this.props.match.params.pathId+"/statistics"}  className="user_default_btn fr font-18 xxtjbtn">
+									className={"fr font-18 color-white kaike mr20 kkbths"}
-									学习统计
+									onClick={this.allow_deletepath}
-									</Link>:""
+								>删除</a>:""}
-									}
 
+								{detailInfoList===undefined?"":detailInfoList.allow_statistics===true?
+									<Link to={"/paths/"+this.props.match.params.pathId+"/edit"} className="fr font-18 color-white kaike mr20 kkbths" >
+										编辑
+									</Link>
+									:""
+								}
 							</div>
 
 

public/react/src/modules/paths/PathDetail/sendPanel.js

@@ -180,7 +180,7 @@ class sendPanel extends Component{
         {
           this.props.detailInfoList===undefined?"":this.props.detailInfoList.allow_send===true?
             <Tooltip placement="bottom" title="以实训作业的形式发送到我的课堂">
-              <a onClick = {this.SentToLesson} className="fl font-18 color-white kaike mr20 kkbths">
+              <a onClick = {this.SentToLesson} className="fr font-18 color-white kaike mr20 kkbths">
                 发送至
               </a>
             </Tooltip>:''