From 679f0a5d819eeee77d9636fc15e4e68894eeb8ad Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 26 Jul 2019 18:24:23 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E9=AB=98=E6=A0=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20190726101533_modify_test_user_for_school.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 db/migrate/20190726101533_modify_test_user_for_school.rb diff --git a/db/migrate/20190726101533_modify_test_user_for_school.rb b/db/migrate/20190726101533_modify_test_user_for_school.rb new file mode 100644 index 00000000..f2ecc3e7 --- /dev/null +++ b/db/migrate/20190726101533_modify_test_user_for_school.rb @@ -0,0 +1,13 @@ +class ModifyTestUserForSchool < ActiveRecord::Migration + def up + school_ids = School.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 From 718f08a568c1df54ff3ac9d46deee13a09685495 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 26 Jul 2019 18:31:00 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=AB=98=E6=A0=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/migrate/20190726101533_modify_test_user_for_school.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20190726101533_modify_test_user_for_school.rb b/db/migrate/20190726101533_modify_test_user_for_school.rb index f2ecc3e7..2b9d4f43 100644 --- a/db/migrate/20190726101533_modify_test_user_for_school.rb +++ b/db/migrate/20190726101533_modify_test_user_for_school.rb @@ -1,6 +1,6 @@ class ModifyTestUserForSchool < ActiveRecord::Migration def up - school_ids = School.pluck(:id) + 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 From 6799fa31833b3112c0a5d854f760a41d31dd112f Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 26 Jul 2019 20:42:23 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/update.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/update.html b/public/update.html index 2be5462a..cc8b8cce 100644 --- a/public/update.html +++ b/public/update.html @@ -56,7 +56,7 @@ If you continue to experience problems please contact your Trustie administrator 温馨提示:为了给大家提供更优质的服务

- 平台拟于2019年7月22日10:40--2019年7月22号11:00进行全面升级，带来不便，敬请谅解！ + 平台拟于2019年7月26日22:00--2019年7月26号23:30进行全面升级，带来不便，敬请谅解！

user_tidings.html.erb From 6b95c9ced891d3d96e7c52dd3ae0422919904170 Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Fri, 26 Jul 2019 21:46:01 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=8F=90=E9=86=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/update.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/update.html b/public/update.html index 2be5462a..3023eda8 100644 --- a/public/update.html +++ b/public/update.html @@ -53,10 +53,10 @@ If you continue to experience problems please contact your Trustie administrator

- 温馨提示:为了给大家提供更优质的服务 + 温馨提示:因第三方云服务升级，为了给大家提供更优质的服务

- 平台拟于2019年7月22日10:40--2019年7月22号11:00进行全面升级，带来不便，敬请谅解！ + 平台拟于2019年7月26日22:00--2019年7月26号11:30进行全面升级，带来不便，敬请谅解！

user_tidings.html.erb From 717e646ddfedd78c3496007ccee1edde25634caf Mon Sep 17 00:00:00 2001 From: jingquan huang Date: Fri, 26 Jul 2019 21:54:10 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E5=A4=A7=E8=B5=9B=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/update.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/update.html b/public/update.html index 3023eda8..d900d445 100644 --- a/public/update.html +++ b/public/update.html @@ -58,6 +58,6 @@ If you continue to experience problems please contact your Trustie administrator

平台拟于2019年7月26日22:00--2019年7月26号11:30进行全面升级，带来不便，敬请谅解！

- user_tidings.html.erb + From 40dc4e32974c3e3cd4547b1f5f3ab966023c86f8 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Fri, 26 Jul 2019 22:10:18 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/update.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/update.html b/public/update.html index cc8b8cce..f7fbf5a4 100644 --- a/public/update.html +++ b/public/update.html @@ -58,6 +58,6 @@ If you continue to experience problems please contact your Trustie administrator

平台拟于2019年7月26日22:00--2019年7月26号23:30进行全面升级，带来不便，敬请谅解！

- user_tidings.html.erb + From f6f49673f9e2df89aba86854250d0b458e1c3cda Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sat, 27 Jul 2019 15:13:10 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8A=A5=E5=90=8D?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=A1=86--=E6=8F=90=E7=A4=BA=E6=96=87?= =?UTF-8?q?=E5=AD=97=E5=B1=85=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/edu/application.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/public/javascripts/edu/application.js b/public/javascripts/edu/application.js index 36c0764f..201f5d69 100644 --- a/public/javascripts/edu/application.js +++ b/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 = '

提示

'+ + var htmlvalue = '
提示
'+ '

' + str + '

取消'+ ''+btnstr+'
'; pop_box_new(htmlvalue, 578, 205); @@ -273,14 +273,14 @@ function sure_box_redirect_btn2(url, str, btnstr){ //提示框：只有一个知道啦按钮，点击打开新窗口 // function sure_box_redirect_without_newtab(url, str){ - var htmlvalue = '

提示

'+ + var htmlvalue = '
提示
'+ '

' + str + '

'+ '知道啦
'; pop_box_new(htmlvalue, 480, 160); } //按钮内容自定义 function sure_box_redirect_without_newtab_btn(url, str,btnstr){ - var htmlvalue = '

提示

'+ + var htmlvalue = '
提示
'+ '

' + str + '

'+ ''+btnstr+'
'; pop_box_new(htmlvalue, 480, 160); @@ -289,7 +289,7 @@ function sure_box_redirect_without_newtab_btn(url, str,btnstr){ //提示框：只有一个确定按钮，点击跳转 // function notice_box_redirect(url, str){ - var htmlvalue = '

提示

'+ + var htmlvalue = '
提示
'+ '

' + str + '

'+ '确定
'; pop_box_new(htmlvalue, 480, 160); @@ -298,7 +298,7 @@ function notice_box_redirect(url, str){ //提示框：只有一个确定按钮，点击跳转（局部刷新） // function notice_box_redirect_remote(url, str){ - var htmlvalue = '

提示

'+ + var htmlvalue = '
提示
'+ '

' + str + '

'+ '确定
'; pop_box_new(htmlvalue, 480, 160); From a99b85b280177a61ca34cf3c5ee83c8b951f1ad9 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sat, 27 Jul 2019 16:02:01 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E7=AB=9E=E8=B5=9B-=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=A0=87=E6=B3=A8=E7=BB=84-title?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/competitions/_gq_second_code_competition.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/competitions/_gq_second_code_competition.html.erb b/app/views/competitions/_gq_second_code_competition.html.erb index 7e681b2e..bc54e485 100644 --- a/app/views/competitions/_gq_second_code_competition.html.erb +++ b/app/views/competitions/_gq_second_code_competition.html.erb @@ -82,7 +82,7 @@ second_section = stage.competition_stage_sections[1] %>
"> -

<%= stage.name %>

+

<%= index == 2 ? '经典算法阅读与标注' : index == 3 ? '自然语言处理NLP' : '深度学习框架' %>

-
+
<% 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" %>
    diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb index 35e39ac6..5089fb28 100644 --- a/app/views/layouts/_logined_header.html.erb +++ b/app/views/layouts/_logined_header.html.erb @@ -50,7 +50,7 @@
-
+
<%= 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" %>
    <%= User.current.show_name %> diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb index 11aabde9..17b5ea12 100644 --- a/app/views/layouts/_unlogin_header.html.erb +++ b/app/views/layouts/_unlogin_header.html.erb @@ -50,7 +50,7 @@
- + 登录 注册 From b05e8ce00183e844bb96d1d651ac714110760995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 27 Jul 2019 16:34:00 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/tpm/NewHeader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js index 4ab7ae81..b62ab515 100644 --- a/public/react/src/modules/tpm/NewHeader.js +++ b/public/react/src/modules/tpm/NewHeader.js @@ -435,7 +435,7 @@ class NewHeader extends Component { */}
- + @@ -456,7 +456,7 @@ class NewHeader extends Component {
- + 登录 注册 From 529e50feb2dac2ca44abc696c8e84b24b9203c72 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sat, 27 Jul 2019 16:46:05 +0800 Subject: [PATCH 12/15] =?UTF-8?q?=E7=AB=9E=E8=B5=9B-=E5=A4=B4=E9=83=A8?= =?UTF-8?q?=E7=9A=84logo=E5=A4=A7=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/competitions/_header.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/competitions/_header.html.erb b/app/views/competitions/_header.html.erb index f26eb6ab..ab03c203 100644 --- a/app/views/competitions/_header.html.erb +++ b/app/views/competitions/_header.html.erb @@ -1,7 +1,7 @@
高校智能化教学与实训平台 + src="/images/educoder/headNavLogo.png?1526520218" style="width:130px">
    From a30cb41e63d920e3b44d63e32115eb7a780e4999 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 27 Jul 2019 16:46:22 +0800 Subject: [PATCH 13/15] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/educoder/edu-all.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 823d4a49..373ec3bd 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -24,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} From 82c5bac915016d3f843a7d648eb0158b5a42f23f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 27 Jul 2019 17:03:28 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/educoder/edu-all.css | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css index 373ec3bd..fda0c4b2 100644 --- a/public/stylesheets/educoder/edu-all.css +++ b/public/stylesheets/educoder/edu-all.css @@ -611,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;} From 7537e8e2c9c3736ab26a8541a87c1b96ad55a6a4 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Sat, 27 Jul 2019 17:19:10 +0800 Subject: [PATCH 15/15] =?UTF-8?q?=E7=AB=9E=E8=B5=9Blogo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/competitions/_header.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/competitions/_header.html.erb b/app/views/competitions/_header.html.erb index ddd8fcad..c3cd42ce 100644 --- a/app/views/competitions/_header.html.erb +++ b/app/views/competitions/_header.html.erb @@ -1,7 +1,7 @@