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

app/views/competitions/_gq_second_code_competition.html.erb

@@ -82,7 +82,7 @@
       second_section = stage.competition_stage_sections[1]
     %>
     <div class="enter_panel" style="<%= i.zero? ? "height: 1212px" : ''%>">
-      <p class="challenge_title"><%= stage.name %></p>
+      <p class="challenge_title"><%= index == 2 ? '经典算法阅读与标注' : index == 3 ? '自然语言处理NLP' : '深度学习框架' %></p>
       <ul class="clearfix challenge_sub_title">
         <li class="fl">
           <span class="mr20"><%= first_section.try(:name) %></span>

app/views/competitions/_header.html.erb

@@ -1,7 +1,7 @@
 <div id="competition-header" class="clearfix">
   <a href="/" style="margin: 10px 20px; display: inline-block;">
     <img alt="高校智能化教学与实训平台" class="logoimg" 
-          src="/images/educoder/headNavLogo.png?1526520218" style="width:40px">
+          src="/images/educoder/headNavLogo.png?1526520218" style="width:130px;margin-top:0px">
   </a>
   <div class="inline fr">
     <ul class="nav-game fl">
@@ -68,7 +68,7 @@
 
       <div class="nav-border"><p id="nav-white"></p></div>
     </ul>
-    <div class="fr edu-menu-panel ml15" style="height:60px;">
+    <div class="fr edu-menu-panel" style="height:60px;">
       <% if User.current.logged? %>
         <%= link_to (image_tag(url_to_avatar(User.current), :width =>"34", :height => "34", :class => "radius", :nhname => "avatar_image", :alt=>"头像", :id => "nh_user_logo")), user_path(User.current),:class => "fr mt15 ml40" %>
         <ul class="edu-menu-list edu-menu-lists" style="top:60px;">

app/views/layouts/_logined_header.html.erb

@@ -50,7 +50,7 @@
       </div>
     </div>
   </div>
-  <div class="fr edu-menu-panel ml15" style="height:60px;">
+  <div class="fr edu-menu-panel" style="height:60px;">
     <%= link_to (image_tag(url_to_avatar(User.current), :width =>"34", :height => "34", :class => "radius mt13", :nhname => "avatar_image", :alt=>"头像", :id => "nh_user_logo")), user_path(User.current),:class => "fl" %>
     <ul class="edu-menu-list" style="top:60px;">
       <span class="bor-bottom-greyE currentName task-hide"><%= User.current.show_name %></span>

app/views/layouts/_unlogin_header.html.erb

@@ -50,7 +50,7 @@
     </div>
   </div>
 
-  <span class="font-15 fr mt15 ml15">
+  <span class="font-15 fr mt15">
       <a href="/login" class="mr5 color-white">登录</a>
     <em class="vertical-line"></em>
     <a href="/register" class="mr5 color-white">注册</a>

db/migrate/20190726101533_modify_test_user_for_school.rb

@@ -0,0 +1,13 @@
+class ModifyTestUserForSchool < ActiveRecord::Migration
+  def up
+    school_ids = School.where("id < 1500").pluck(:id)
+    users = User.where(is_test: true).includes(:user_extensions)
+    users.find_each do |u|
+      school_id = school_ids.sample
+      u.user_extensions.update_column(:school_id, school_id) if u.user_extensions.present?
+    end
+  end
+
+  def down
+  end
+end

public/javascripts/edu/application.js

@@ -263,7 +263,7 @@ function sure_box_redirect_btn(url, str,btnstr){
 
 
 function sure_box_redirect_btn2(url, str, btnstr){
-    var htmlvalue = '<div class="task-popup" style="width:500px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3> <a href="javascript:void(0)" id="closeIcon" style="top: -48px;right: -20px;z-index: 100000;"><i class="iconfont icon-shanchudiao"></i></a></div>'+
+    var htmlvalue = '<div class="task-popup" style="width:500px;"><div class="task-popup-title clearfix">提示<a href="javascript:void(0)" id="closeIcon" style="top: -48px;right: -20px;z-index: 100000;"><i class="iconfont icon-shanchudiao"></i></a></div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-submit clearfix" style="width: 150px"><a href="javascript:void(0);" onclick="hideModal();" class="task-btn fl">取消</a>'+
         '<a href="'+ url +'" class="task-btn task-btn-orange fr" target="_blank" onclick="hideModal();">'+btnstr+'</a></div></div>';
     pop_box_new(htmlvalue, 578, 205);
@@ -273,14 +273,14 @@ function sure_box_redirect_btn2(url, str, btnstr){
 //提示框：只有一个知道啦按钮，点击打开新窗口
 //<a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
 function sure_box_redirect_without_newtab(url, str){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix">提示</div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-OK clearfix">'+
         '<a href="'+ url +'" class="task-btn task-btn-orange" onclick="hideModal();" >知道啦</a></div></div>';
     pop_box_new(htmlvalue, 480, 160);
 }
 //按钮内容自定义
 function sure_box_redirect_without_newtab_btn(url, str,btnstr){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix">提示</div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-OK clearfix">'+
         '<a href="'+ url +'" class="task-btn task-btn-orange" onclick="hideModal();" >'+btnstr+'</a></div></div>';
     pop_box_new(htmlvalue, 480, 160);
@@ -289,7 +289,7 @@ function sure_box_redirect_without_newtab_btn(url, str,btnstr){
 //提示框：只有一个确定按钮，点击跳转
 //<a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
 function notice_box_redirect(url, str){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix">提示</div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-sure clearfix">'+
         '<a href="'+ url +'" class="task-btn task-btn-orange" onclick="hideModal();">确定</a></div></div>';
     pop_box_new(htmlvalue, 480, 160);
@@ -298,7 +298,7 @@ function notice_box_redirect(url, str){
 //提示框：只有一个确定按钮，点击跳转（局部刷新）
 //<a href="'+ url +'" class="pop_close"><i class="fa fa-times-circle font-18 link-color-grey fr mt5"></i></a>
 function notice_box_redirect_remote(url, str){
-    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix"><h3 class="fl color-grey3">提示</h3></div>'+
+    var htmlvalue = '<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix">提示</div>'+
         '<div class="task-popup-content"><p class="task-popup-text-center font-16">' + str + '</p></div><div class="task-popup-sure clearfix">'+
         '<a href="'+ url +'" class="task-btn task-btn-orange" data-remote="true">确定</a></div></div>';
     pop_box_new(htmlvalue, 480, 160);

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

@@ -435,7 +435,7 @@ class NewHeader extends Component {
 			    </span>*/}
                 <div style={{display:isLogin===true?'block':'none'}}>
                     <div className="fr edu-menu-panel" style={{height:'60px'}}>
-                            <a href={`/users/${current_user.login}`} className="fl ml15">
+                            <a href={`/users/${current_user.login}`} className="fl">
                                 <img alt="头像" className="radius mt13" height="34" id="nh_user_logo" nhname="avatar_image"
                                         src={`/images/${current_user.image_url}`} width="34">
                                 </img>
@@ -456,7 +456,7 @@ class NewHeader extends Component {
 
 
                 <div style={{display:isLogin===false?'block':'none'}}>
-                    <span className="font-15 fr mt15 ml15">
+                    <span className="font-15 fr mt15">
                         <a href="/login" className="mr5 color-white">登录</a>
                         <em className="vertical-line"></em>
                         <a href="/user_join" className="mr5 color-white">注册</a>

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

@@ -17,6 +17,9 @@ body>.-task-title {
 
 /*Header START*/
 .newHeader .logoimg {
+	margin-top: 16px;
+	float: left;
+	width: 97px;
 	max-height: 60px;
 }
 .head-right i {

public/stylesheets/educoder/edu-all.css

@@ -1,7 +1,11 @@
 /*--------------------------首页*/
 /*头部导航条样式---2018-03-19--by-cs*/
 .newHeader{background: #24292D;width:100%; height: 60px; min-width: 1200px;position: fixed;top: 0px;left: 0px;z-index:1000;-moz-box-shadow: 0px 0px 12px rgba(0,0,0,0.1); /* 老的 Firefox */box-shadow: 0px 0px 12px rgba(0,0,0,0.1);}
-.newHeader .logoimg{margin-top:12px;float: left;width: 36px}
+.newHeader .logoimg{
+    margin-top: 16px;
+    float: left;
+    width: 97px;
+}
 .head-nav{float: left;width: 920px;text-align: center;height: 60px;box-sizing: border-box;  min-width: 400px;}
 .head-nav ul#header-nav{position: absolute;top: 0px;z-index: 3;height: 60px;box-sizing: border-box;padding-left: 30px;}
 .head-nav ul#header-nav li{float: left;height: 60px;line-height: 60px;margin-right: 30px;cursor: pointer;position: relative;font-size: 16px}
@@ -20,7 +24,7 @@
 .nav-img{position: absolute;top:2px;right: -8px;display: none}
 
 .head-right{box-sizing: border-box;height: 60px; background: #24292D; }
-.head-right i{margin-top:12px;float: right;margin-right: 15px;margin-left: 15px;}
+.head-right i{margin-top:12px;float: right;margin-right: 12px;margin-left: 15px;}
 /* tpm*/
 .educontent .icon { padding-left: 0px !important;    padding-top: 0px !important;   padding-bottom: 0px !important;}
 em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
@@ -607,6 +611,11 @@ p .activity-item:first-child{border-top: 1px solid #eee;}
 #hnpage1{background: url('/images/educoder/competition/logo_1.jpg') no-repeat top center;min-height: 820px;}
 
 #competition-header{background:#24292D;height: 60px;width: 100%;padding-right: 40px;box-sizing: border-box;position: fixed;top: 0px;left: 0px;width: 100%;z-index: 1000;}
+#competition-header .logoimg{
+    margin-top: 5px;
+    float: left;
+    width: 97px;}
+
 .nav-game{position: relative;}
 .nav-game li{position: relative;float: left;width: 110px;height: 60px;line-height: 60px;text-align: center;box-sizing: border-box}
 .nav-game li a{color:#fff;font-size: 16px;}

public/update.html

@@ -56,8 +56,8 @@ If you continue to experience problems please contact your Trustie administrator
             温馨提示:为了给大家提供更优质的服务
         </p>
         <p class="font-18">
-            平台拟于<span style="color: red">2019年7月22日10:40--2019年7月22号11:00</span>进行全面升级，带来不便，敬请谅解！
+            平台拟于<span style="color: red">2019年7月26日22:00--2019年7月26号23:30</span>进行全面升级，带来不便，敬请谅解！
         </p>
-    </div>user_tidings.html.erb
+    </div>
 </body>
 </html>