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

app/views/users/_user_tiddings_list.erb

@@ -28,7 +28,7 @@
               <span class="edu-filter-btn ml20 <%= tids.status == 0 ? 'edu-filter-btn-red' : tids.status == 1 ? 'edu-filter-btn-green' : "" %>"><%= tids.status == 0 ? '待处理' : tids.status == 1 ? '已处理' : "" %></span>
             <% end %>
           </p>
-          <p class="color-grey-6 break_word_firefox" style="word-break: break-word;"><%= tids.container_type == "StudentJoinCourse" ? tids.user.try(:show_name) : "" %><%= message_content(tids.keyx_word).html_safe %></p>
+          <p class="color-grey-6 break_word_firefox" style="word-break: break-word;"><%= tids.container_type == "StudentJoinCourse" ? tids.user.try(:show_name) : "" %><%= message_content(tids.key_word).html_safe %></p>
         </div>
         <% if @onclick_time < tids.created_at %>
           <span class="new-point fr mr40 mt22"></span>

public/react/src/modules/ShCommunity/CommunityHome.js

@@ -27,7 +27,7 @@ class CommunityHome extends Component {
         }
       }
       componentWillMount(){
-        window.document.title = 'Educoder';
+        window.document.title = 'EduCoder';
 
         }
         componentWillReceiveProps(nextProps){

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

@@ -36,14 +36,14 @@ class NewFooter extends Component {
         <div className="newFooter edu-txt-center">
         <div className="inner-footer_con">
           <div className="footercon">
-            <div class="inline mt40 mb5">
+            {/* <div class="inline mt40 mb5">
                 <a href="/" class="fl" style={{height:'70px'}}>
 
                   {ImageUrlType===false?<img alt="高校智能化教学与实训平台" src={getImageUrl(ImageUrl)} style={{width: '70px'}}/>:<img alt="高校智能化教学与实训平台" src={getImageUrl(ImageUrl)} style={{width: '100px'}}/>}
 
                 </a>
                 <span class="fl color-grey-c cdefault font-28 ml22" style={{lineHeight:'74px'}}>EduCoder.net</span>
-            </div>
+            </div> */}
             <ul className="clearfix inner-footernav">
               <li><a href="/" className="fl" target="_blank">网站首页</a></li>
               <li><a href="/help?index=1" className="fl" target="_blank">关于我们</a></li>

public/react/src/modules/tpm/TPMIndex.css

@@ -37,7 +37,4 @@ body>.-task-title {
 }
 
 /*Main START*/
-.newMain {
+
-	/* 330̫<30><CCAB><EFBFBD>ˣ<EFBFBD>*/
-	padding-bottom: 240px !important;
-}

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

@@ -13,11 +13,11 @@ const $ = window.$;
 
 let _url_origin = getUrl()
 $('head').append( $('<link rel="stylesheet" type="text/css" />')
-  .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1525440977`) );
+  .attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?1525440978`) );
 $('head').append( $('<link rel="stylesheet" type="text/css" />')
   .attr('href', `${_url_origin}/stylesheets/educoder/magic-check.css?1525440977`) );
 $('head').append( $('<link rel="stylesheet" type="text/css" />')
-  .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?1525440977`) );
+  .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?1525440978`) );
 $('head').append( $('<link rel="stylesheet" type="text/css" />')
   .attr('href', `${_url_origin}/stylesheets/educoder/edu-admin.css?1525440977`) );
 

public/stylesheets/educoder/edu-all.css

@@ -51,6 +51,8 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
 .search-content a{display: inline-block;width:100%;height: 30px;line-height: 30px;padding:0px 20px;box-sizing: border-box;text-align: left;white-space: nowrap;text-overflow: ellipsis;overflow: hidden;}
 /*底部*/
 .newFooter{ position: absolute; bottom: 0; width: 100%; height: 235px;background: #323232; clear:both; min-width: 1200px;z-index:8;left: 0px;}
+/* 去掉了logo */
+.newFooter{ height: 110px; }
 .footercon{border-bottom:1px solid #47494d;}
 .inner-footernav{width: 560px;margin: 0px auto}
 .inner-footernav li{float: left;height: 50px;width: 80px;text-align: center}

public/stylesheets/educoder/edu-main.css

@@ -192,6 +192,7 @@ input::-ms-clear{display:none;}
 .newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;}
 .educontent{width: 1200px;margin:0px auto;box-sizing: border-box}/*中间部分宽度固定为1200*/
 .newMain{ margin: 0 auto; padding-bottom: 235px; min-width:1200px;padding-top: 60px}/*padding-bottom根据底部的高度而定*/
+.newMain{ padding-bottom: 120px !important; }
 
 /*高度*/
 .height-100{height: 100%;}