Fix: revice account info box in the top

src/web/module/maestro_section_app_setting.html

@@ -2,11 +2,6 @@
 
 
 $(document).ready(function() {
-	$("#timer_short_url").html(
-		"<span class='text-secondary'>자격증 타이머 앱 <span class='font-weight-bold'>바로 실행 URL</span> :</span><br/>"
-		+ "http://www.chocomae.com/timer/" + maestroInfo.maestroName
-	);
-
 	/*
 	$("#entercode").keydown(function(key) {
 		if(key.keyCode == 13) {
@@ -88,22 +83,6 @@ function onErrorPassword(message) {
 	<div class="col-5">
 		<h5 class="my-3">자격증 타이머</h5>
 
-		<!--
-		<div class="input-group mb-3">
-			<div class="input-group-prepend">
-				<span class="input-group-text" id="timer-password">비밀번호</span>
-			</div>
-			<input type="text" class="form-control" placeholder="새로운 비밀번호 입력" aria-label="timer password" aria-describedby="submit-password">
-			<div class="input-group-append">
-				<button class="btn btn-primary" type="button" id="submit-password" onClick="updatePassword()">수정</button>
-			</div>
-		</div>
-		<small class="form-text text-muted">1~8 글자 / [ 한글,영문,숫자,-,_ ]</small>
-		-->
-
-		<div id="timer_short_url" class="col-sm pr-0 my-auto"></div>
-		<br/>
-
 		<form class="mx-2">
 
 			<div class="form-group row">

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 + "<br/>유효 기간 : " + Math.ceil(diffDay) + "일");
+	$("#maestro_count_down_date").html("유효 기간 : ~ " + endDate + " <span id='countdown_day'>(남은 기간 : " + Math.ceil(diffDay) + "일)</span>");
 	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(
 		"<span class='text-secondary'>등록 학생 앱 <span class='font-weight-bold'>바로 실행 URL</span> :</span><br/>"
 		+ "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) {
 
 <div class="container py-3">
 	<div class="row border rounded border-dark py-2 mx-0 mb-3">
-		<div id="maestro_info_id" class="col-sm pr-0 my-auto"></div>
+		<div id="maestro_count_down_date" class="col-sm-6 my-auto text-left"></div>
-		<!-- <div id="maestro_url" class="col my-auto"></div> -->
-		<div id="maestro_count_down_date" class="col-sm-2 px-0 my-auto mx-1 text-center"></div>
 
-		<div class="col-sm-5 px-0 d-md-flex align-items-center">
+		<div class="col-sm-6 d-md-flex align-items-right">
 			<div class="input-group my-auto">
 				<input type="text" id="maestro_info_player_count" class="form-control px-2 mx-0" value="학생수 :">
 				<div class="input-group-append">
-					<button class="btn btn-primary px-2 mr-2" type="button" onClick="location.href='./../maestro/upgrade.html';">업그레이드</a>
+					<a class="btn btn-primary px-2 mr-2" role="button" href="./../maestro/upgrade.html">업그레이드</a>
 				</div>
 			</div>
 
-			<a class="btn btn-primary px-2 mr-2" href="./../maestro/setup.html">계정 정보 수정</a>
+			<a class="btn btn-primary my-auto" href="./../maestro/setup.html">계정 정보 수정</a>
 		</div>
 
 	</div>	<!-- row border -->

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 + "<br/>유효 기간 : " + Math.ceil(diffDay) + "일");
+	$("#maestro_count_down_date").html("유효 기간 : ~ " + endDate + " <span id='countdown_day'>(남은 기간 : " + Math.ceil(diffDay) + "일)</span>");
 	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() {
 
 <div class="container py-3">
 	<div class="row border rounded border-dark py-2 mx-0 mb-3">
-		<div id="maestro_info_id" class="col-sm pl-2 my-auto">
+		<div id="maestro_count_down_date" class="col-sm-6 my-auto text-left"></div>
-			<a class="btn btn-dark text-warning" href="javascript:void(0);" onClick="goHome()">< 마에스트로 [홈]</a>
-		</div>
-		<div id="maestro_count_down_date" class="col-sm-2 px-0 my-auto mx-1 text-center"></div>
 
-		<div class="col-sm-5 px-0 d-md-flex align-items-center">
+		<div class="col-sm-6 d-md-flex align-items-right">
 			<div class="input-group my-auto">
 				<input type="text" id="maestro_info_player_count" class="form-control px-2 mx-0" value="학생수 :">
 				<div class="input-group-append">
-					<button class="btn btn-primary px-2 mr-2" type="button" onClick="location.href='./../maestro/upgrade.html';">업그레이드</a>
+					<a class="btn btn-primary px-2 mr-2" role="button" href="./../maestro/upgrade.html">업그레이드</a>
 				</div>
 			</div>
 
-			<a class="btn btn-primary px-2 mr-2 disabled" href="./../maestro/setup.html">계정 정보 수정</a>
+			<a class="btn btn-primary my-auto disabled" href="./../maestro/setup.html">계정 정보 수정</a>
 		</div>
 
 	</div>	<!-- row border -->

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 + "<br/>유효 기간 : " + Math.ceil(diffDay) + "일");
+	$("#maestro_count_down_date").html("유효 기간 : ~ " + endDate + " <span id='countdown_day'>(남은 기간 : " + Math.ceil(diffDay) + "일)</span>");
 	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) {
 
 <div class="container py-3">
 	<div class="row border rounded border-dark py-2 mx-0 mb-3">
-		<div id="maestro_info_id" class="col-sm pl-2 my-auto">
+		<div id="maestro_count_down_date" class="col-sm-6 my-auto text-left"></div>
-			<a class="btn btn-dark text-warning" href="javascript:void(0);" onClick="goHome()">< 마에스트로 [홈]</a>
-		</div>
-		<div id="maestro_count_down_date" class="col-sm-2 px-0 my-auto mx-1 text-center"></div>
 
-		<div class="col-sm-5 px-0 d-md-flex align-items-center">
+		<div class="col-sm-6 d-md-flex align-items-right">
 			<div class="input-group my-auto">
 				<input type="text" id="maestro_info_player_count" class="form-control px-2 mx-0" value="학생수 :">
 				<div class="input-group-append">
-					<button class="btn btn-primary px-2 mr-2 disabled" type="button" onClick="location.href='./../maestro/upgrade.html';">업그레이드</a>
+					<a class="btn btn-primary px-2 mr-2 disabled" role="button" href="./../maestro/upgrade.html">업그레이드</a>
 				</div>
 			</div>
 
-			<a class="btn btn-primary px-2 mr-2" href="./../maestro/setup.html">계정 정보 수정</a>
+			<a class="btn btn-primary my-auto" href="./../maestro/setup.html">계정 정보 수정</a>
 		</div>
 
 	</div>	<!-- row border -->