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

public/react/src/modules/courses/busyWork/CommonWorkQuestion.js

@@ -91,7 +91,7 @@ class CommonWorkQuestion extends Component{
         
         {/* 内容区 */}
         <div className="padding40 memoContent new_li">
-          <MarkdownToHtml content={description} selector="work_content"></MarkdownToHtml>
+          <MarkdownToHtml content={description} selector="work_content" className="mb10"></MarkdownToHtml>
 
           { attachments && attachments.map((item) => {
             return ( <div className="color-grey">

public/react/src/modules/courses/new/CoursesNew.js

@@ -1,11 +1,12 @@
 import React, {Component} from "React";
-import {Form, Select, Input, Button, Checkbox, DatePicker,Spin,Icon,AutoComplete,InputNumber} from "antd";
+import {Form, Select, Input, Button, Checkbox, DatePicker,Spin,Icon,AutoComplete,InputNumber,Breadcrumb} from "antd";
 import ApplyForAddOrgModal from '../../user/modal/ApplyForAddOrgModal';
 import axios from 'axios';
 import "../css/Courses.css";
 import locale from 'antd/lib/date-picker/locale/zh_CN';
 import moment from 'moment';
 import Modals from '../../modals/Modals';
+import {WordsBtn, ActionBtn} from 'educoder';
 
 
 
@@ -503,8 +504,22 @@ class CoursesNew extends Component {
                     />
                     <div className="newMain clearfix">
                         <div className={"educontent mb20"}>
+                            {/*<Breadcrumb className="mt10" separator=">">*/}
+                            {/*    <Breadcrumb.Item>*/}
+                            {/*        <a href="/courses">翻转课堂</a>*/}
+                            {/*    </Breadcrumb.Item>*/}
+                            {/*    <Breadcrumb.Item>{this.props.match.params.coursesId === undefined ?"新建课堂":"编辑课堂"}</Breadcrumb.Item>*/}
+                            {/*</Breadcrumb>*/}
+
+                            <p className="clearfix mb20 mt10">
+                                <a className="btn colorgrey fl hovercolorblue " href="/courses">翻转课堂</a>
+                                <span className="color-grey-9 fl ml3 mr3">&gt;</span>
+                                <WordsBtn className="fl">{this.props.match.params.coursesId === undefined ?"新建课堂":"编辑课堂"}</WordsBtn>
+                            </p>
+
+
                             <div style={{width: '100%', height: '70px'}}>
-                                <p className="ml15 fl color-black mt30 summaryname">{this.props.match.params.coursesId === undefined ? "新建课堂" : "编辑课堂"}</p>
+                                <p className=" fl color-black mt18 summaryname">{this.props.match.params.coursesId === undefined ? "新建课堂" : "编辑课堂"}</p>
                                 <a onClick={this.goback} className="color-grey-6 fr font-16 ml30 mt18 mr20">返回</a>
                             </div>
                             <style>

public/react/src/modules/courses/new/Goldsubject.js

@@ -6,7 +6,7 @@ import "../css/Courses.css";
 import locale from 'antd/lib/date-picker/locale/zh_CN';
 import moment from 'moment';
 import Modals from '../../modals/Modals';
-
+import {WordsBtn, ActionBtn} from 'educoder';
 
 
 const { Option } = Select;
@@ -651,12 +651,18 @@ class Goldsubject extends Component {
 					<div className="newMain clearfix">
 
 						<div className={"educontent mb20"}>
-							<Breadcrumb className="mt10" separator=">">
-								<Breadcrumb.Item>
-									<a href="/">首页</a>
-								</Breadcrumb.Item>
-								<Breadcrumb.Item>{Whethertocreateanewclassroom===true?"新建课堂":"编辑课堂"}</Breadcrumb.Item>
-							</Breadcrumb>
+							{/*<Breadcrumb className="mt10" separator=">">*/}
+							{/*	<Breadcrumb.Item>*/}
+							{/*		<a href="/courses">翻转课堂</a>*/}
+							{/*	</Breadcrumb.Item>*/}
+							{/*	<Breadcrumb.Item>{Whethertocreateanewclassroom===true?"新建课堂":"编辑课堂"}</Breadcrumb.Item>*/}
+							{/*</Breadcrumb>*/}
+							<p className="clearfix mb20 mt10">
+								<a className="btn colorgrey fl hovercolorblue " href="/courses">翻转课堂</a>
+								<span className="color-grey-9 fl ml3 mr3">&gt;</span>
+								<WordsBtn className="fl">{Whethertocreateanewclassroom===true?"新建课堂":"编辑课堂"}</WordsBtn>
+							</p>
+
 							<div style={{width: '100%', height: '70px'}}>
 								<p className=" fl color-black mt18 summaryname">{Whethertocreateanewclassroom===true ? "新建课堂" : "编辑课堂"}</p>
 								<a onClick={this.goback} className="color-grey-6 fr font-16 ml30 mt18 mr20"></a>