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

config/routes.rb

@@ -289,6 +289,7 @@ Rails.application.routes.draw do
         post :down_member_position
         get :right_banner
         post :appointment
+        post :update_team_title
       end
 
       collection do
@@ -1077,7 +1078,6 @@ Rails.application.routes.draw do
         post :cancel_homepage_show
         post :excellent
         post :cancel_excellent
-        post :update_team_title
       end
     end
   end

public/editormd/lib/marked.min.js

@@ -10,8 +10,9 @@
    out+=this.renderer.em(this.output(cap[2]||cap[1]))   -->
    out+=this.renderer.em(this.output(cap[2]||cap[1]), cap.input)
  */
-// 0.4.0  /^ *(#{1,6}) ——》/^ *(#{1,6})   去掉了一个空格 TODO 行内公式带_
+// 0.4.0  /^ *(#{1,6}) ——》/^ *(#{1,6})   去掉了一个空格 
 /*if("string"!=typeof e)throw new Error("marked(): input parameter is of type "+Object.prototype.toString.call(e)+", string expected");*/
+// 说明：左边 --> 右边  左边被替换成了右边的内容
 // b(i[1].replace(/^ *| *\| *$/g,"")) --> i[1].replace(/^ *| *\| *$/g, "").split(/ *\| */)    table没识别的问题
 // header.length===a.align.length --> header.length  table没识别的问题    
 // 2个table： b(a.cells[p],a.header.length) -> a.cells[p].replace(/^ *\| *| *\| *$/g, "").split(/ *\| */)

public/react/public/js/readme.txt

@@ -1 +1,17 @@
-需要合并的js，确保每个js的结尾都有个;号，不然合并后会报脚本错误。
+js_min_all含的js
+
+es6-shim
+jQuery v1.8.3
+Underscore.js 1.8.2
+marked v0.3.3
+Raphaël 2.1.3
+js sequence diagrams 1.0.4
+flowchart, v1.3.4
+jQuery.flowchart.js v1.1.0
+https://github.com/pandao/editor.md
+http://codemirror.net
+
+diff_match_patch
+codemirror merge.js
+
+从 edu_tpi.js 挪过来的js

public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfdownload.js

@@ -140,7 +140,10 @@ class CompetitionContentspdfdownload extends Component{
 				</Row>
 
 				<Row className={"mt30"}>
-				   <Col>个人证书：{data&&data.personal_certifications.length===0?<span><span className={"pdfpicture font-14"}>暂未生成</span>  <span className={"ml20"}>原因：<span className={"pdfpicture font-14"}>还未认证个人信息，</span><a className={"pdfdownloadfont4CACFF"} onClick={()=>this.props.Competitioncallback("2")}>立即查看</a></span></span>:
+				   <Col>个人证书：{data&&data.personal_certifications.length===0&&data&&data.all_certified===false?
+						 <span><span className={"pdfpicture font-14"}>暂未生成</span>  <span className={"ml20"}>原因：<span className={"pdfpicture font-14"}>还未认证个人信息，</span><a className={"pdfdownloadfont4CACFF"} onClick={()=>this.props.Competitioncallback("2")}>立即认证</a></span></span>:
+						 data&&data.personal_certifications.length===0&&data&&data.all_certified===true?
+							 <span><span className={"pdfpicture font-14"}>暂未生成</span>  <span className={"ml20"}>原因：<span className={"pdfpicture font-14"}>组委会未完成证书审批，请稍后</span></span></span>:
 						 data&&data.personal_certifications.map((item,key)=>{
 							return(
 								<span className={"mr10"} key={key}>

public/react/src/modules/tpm/challengesnew/TPMMDEditor.js

@@ -132,6 +132,7 @@ function create_editorMD(id, width, high, placeholder, imageUrl, callback, initV
             // Or return editormd.toolbarModes[name]; // full, simple, mini
             // Using "||" set icons align right.
             const icons = ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"];
+            // 试卷处用到的填空题新增按钮
             if (__that.props.showNullButton) {
                 icons.push('nullBtton')
             }
@@ -228,12 +229,14 @@ export default class TPMMDEditor extends Component {
         const imageUrl = `/api/attachments.json`;
         // 创建editorMd
         let react_id = `react_${_id}`;
+        // 将实例存到了window
         window[react_id] = this
         const answers_editormd = create_editorMD(_id, '100%', this.props.height, _placeholder, imageUrl, (_editorName) => {
             const __editorName = _editorName;
             react_id = `react_${__editorName.id}`;
             const that = window[react_id]
-
+            
+            // 一个延迟的recreate或resize，不加这段代码，md初始化可能会出现样式问题
             setTimeout(() => {
                 if (that.props.needRecreate == true) {
                     __editorName.recreate() // 注意 必须在setValue之前触发，不然会清空
@@ -268,6 +271,7 @@ export default class TPMMDEditor extends Component {
                 that.props.onCMBeforeChange(cm,change)
             })
             that.answers_editormd = __editorName;
+            // 这里应该可以去掉了，方便调试加的
             window[__editorName.id+'_'] = __editorName;
         }, initValue, this.onEditorChange,this.props.watch, {
             noStorage: this.props.noStorage,
@@ -276,6 +280,7 @@ export default class TPMMDEditor extends Component {
         }, this);
         
     }
+    // 用在form里时，validate失败时出现一个红色边框
     showError = () => {
         this.setState({showError: true})
     }