From 6e93456f7d75629d18ffab1c4407e912a537e7c7 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 18 Jul 2019 09:49:56 +0800
Subject: [PATCH 01/55] =?UTF-8?q?=E7=A6=81=E8=B5=9B=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...sName.html.erb.html => _competitions_name.html.erb} | 5 +++--
app/views/layouts/_logined_header.html.erb | 10 +++++++++-
2 files changed, 12 insertions(+), 3 deletions(-)
rename app/views/competitions/{competitionsName.html.erb.html => _competitions_name.html.erb} (96%)
diff --git a/app/views/competitions/competitionsName.html.erb.html b/app/views/competitions/_competitions_name.html.erb
similarity index 96%
rename from app/views/competitions/competitionsName.html.erb.html
rename to app/views/competitions/_competitions_name.html.erb
index 0ae6e2e6..a00c90a4 100644
--- a/app/views/competitions/competitionsName.html.erb.html
+++ b/app/views/competitions/_competitions_name.html.erb
@@ -8,7 +8,6 @@
bottom: 0px;
right: 0px;
}
-ddd
-
+
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 3998a9a5..9d1c9586 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -128,7 +128,15 @@
$("#all_status_show_value").text("用户");
<% end %>
<% end %>
-
+ if (window.localStorage) {
+ var uid = localStorage.getItem('competition_uid');
+ } else {
+ var uid = false
+ }
+ if(!uid){
+ var htmlvalue = "<%= escape_javascript(render :partial => 'competitions/competitions_name')%>";
+ pop_box_new(htmlvalue, 500, 380);
+ }
<% notice = SystemUpdateNotice.last %>
<% if @noticed_update || ((User.current.certification == 1 || params[:controller] != "welcome") && notice.present? && notice.end_time > Time.now && notice.start_time >= (Time.now - 21600) && User.current.user_system_notices.where(:notice_type => notice.notice_type).count == 0) %>
From aaaabd11c1e6cee3bcdcc670805ca5db28fceafe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 18 Jul 2019 10:57:18 +0800
Subject: [PATCH 02/55] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E5=BC=B9=E7=AA=97?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../competitions/_competitions_name.html.erb | 26 +++++--
app/views/layouts/_logined_header.html.erb | 1 +
public/react/src/modules/tpm/NewHeader.js | 75 ++++++++++++++++---
public/stylesheets/educoder/edu-main.css | 3 +-
4 files changed, 88 insertions(+), 17 deletions(-)
diff --git a/app/views/competitions/_competitions_name.html.erb b/app/views/competitions/_competitions_name.html.erb
index ab7f3253..fa56359d 100644
--- a/app/views/competitions/_competitions_name.html.erb
+++ b/app/views/competitions/_competitions_name.html.erb
@@ -12,15 +12,31 @@