From cafd2971ebff5d688ad4748fb5e0565d91906b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=8B=E1=85=A2=E1=84=91=E1=85=B3=E1=86=AF=20=E1=84=82?= =?UTF-8?q?=E1=85=A9=E1=84=90=E1=85=B3=E1=84=87=E1=85=AE=E1=86=A8?= Date: Thu, 21 Mar 2019 20:56:33 +0900 Subject: [PATCH] Fix: revice account info box in the top --- .../module/maestro_section_app_setting.html | 21 ----------------- src/web/module/maestro_section_main.html | 23 +++++++++++-------- src/web/module/maestro_setup.html | 21 ++++++++--------- src/web/module/maestro_upgrade.html | 21 ++++++++--------- 4 files changed, 33 insertions(+), 53 deletions(-) diff --git a/src/web/module/maestro_section_app_setting.html b/src/web/module/maestro_section_app_setting.html index 4a7a5a9..3a1b8ce 100644 --- a/src/web/module/maestro_section_app_setting.html +++ b/src/web/module/maestro_section_app_setting.html @@ -2,11 +2,6 @@ $(document).ready(function() { - $("#timer_short_url").html( - "자격증 타이머 앱 바로 실행 URL :
" - + "http://www.chocomae.com/timer/" + maestroInfo.maestroName - ); - /* $("#entercode").keydown(function(key) { if(key.keyCode == 13) { @@ -88,22 +83,6 @@ function onErrorPassword(message) {
자격증 타이머
- - -
-
-
diff --git a/src/web/module/maestro_section_main.html b/src/web/module/maestro_section_main.html index fdb73a2..0407a4e 100644 --- a/src/web/module/maestro_section_main.html +++ b/src/web/module/maestro_section_main.html @@ -36,20 +36,25 @@ function showEndDate(date) { var endDay = new Date(endDate); var diffDay = (endDay.getTime() - today.getTime()) / (1000 * 60 * 60 * 24); - $("#maestro_count_down_date").html("~ " + endDate + "
유효 기간 : " + Math.ceil(diffDay) + "일"); + $("#maestro_count_down_date").html("유효 기간 : ~ " + endDate + " (남은 기간 : " + Math.ceil(diffDay) + "일)"); if(diffDay < 30) - $("#maestro_count_down_date").addClass("text-danger"); + $("#countdown_day").addClass("text-danger"); else if(diffDay < 10) - $("#maestro_count_down_date").addClass("bg-danger text-light"); + $("#countdown_day").addClass("bg-danger text-light"); else if(diffDay < 0) - $("#maestro_count_down_date").addClass("bg-secondary text-light"); + $("#countdown_day").addClass("bg-secondary text-light"); + else + $("#countdown_day").addClass("text-muted"); } + function onLoadSuccessMaestroInfo() { + /* $("#maestro_info_id").html( "등록 학생 앱 바로 실행 URL :
" + "http://www.chocomae.com/login/" + maestroInfo.maestroName ); + */ showEndDate(maestroInfo.availableActivateDateTime); $("#maestro_info_player_count").val("학생수 : " + maestroInfo.getRegisteredPlayerCount() + " / " + maestroInfo.getMaxPlayerCount()); @@ -156,19 +161,17 @@ function deactivateApp(appID) {
-
- -
+
-
+
-
- 계정 정보 수정 + 계정 정보 수정
diff --git a/src/web/module/maestro_setup.html b/src/web/module/maestro_setup.html index 4f361f3..01942fd 100644 --- a/src/web/module/maestro_setup.html +++ b/src/web/module/maestro_setup.html @@ -57,13 +57,15 @@ function showEndDate(date) { var endDay = new Date(endDate); var diffDay = (endDay.getTime() - today.getTime()) / (1000 * 60 * 60 * 24); - $("#maestro_count_down_date").html("~ " + endDate + "
유효 기간 : " + Math.ceil(diffDay) + "일"); + $("#maestro_count_down_date").html("유효 기간 : ~ " + endDate + " (남은 기간 : " + Math.ceil(diffDay) + "일)"); if(diffDay < 30) - $("#maestro_count_down_date").addClass("text-danger"); + $("#countdown_day").addClass("text-danger"); else if(diffDay < 10) - $("#maestro_count_down_date").addClass("bg-danger text-light"); + $("#countdown_day").addClass("bg-danger text-light"); else if(diffDay < 0) - $("#maestro_count_down_date").addClass("bg-secondary text-light"); + $("#countdown_day").addClass("bg-secondary text-light"); + else + $("#countdown_day").addClass("text-muted"); } function showPlayerCount(accountType, playerCount) { @@ -236,20 +238,17 @@ function changeMaestroPassword() {
- -
+
-
+
-
- 계정 정보 수정 + 계정 정보 수정
diff --git a/src/web/module/maestro_upgrade.html b/src/web/module/maestro_upgrade.html index 7f328a5..96ccf5f 100644 --- a/src/web/module/maestro_upgrade.html +++ b/src/web/module/maestro_upgrade.html @@ -35,13 +35,15 @@ function showEndDate(date) { var endDay = new Date(endDate); var diffDay = (endDay.getTime() - today.getTime()) / (1000 * 60 * 60 * 24); - $("#maestro_count_down_date").html("~ " + endDate + "
유효 기간 : " + Math.ceil(diffDay) + "일"); + $("#maestro_count_down_date").html("유효 기간 : ~ " + endDate + " (남은 기간 : " + Math.ceil(diffDay) + "일)"); if(diffDay < 30) - $("#maestro_count_down_date").addClass("text-danger"); + $("#countdown_day").addClass("text-danger"); else if(diffDay < 10) - $("#maestro_count_down_date").addClass("bg-danger text-light"); + $("#countdown_day").addClass("bg-danger text-light"); else if(diffDay < 0) - $("#maestro_count_down_date").addClass("bg-secondary text-light"); + $("#countdown_day").addClass("bg-secondary text-light"); + else + $("#countdown_day").addClass("text-muted"); } function showPlayerCount(accountType, playerCount) { @@ -173,20 +175,17 @@ function upgradeMaestroInfo(accountType) {
- -
+
-
+
-
- 계정 정보 수정 + 계정 정보 수정