From eee26929dbc9723084994d31d74e7982419fd5bd 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, 5 Jul 2018 07:27:51 +0900 Subject: [PATCH] Fix: search -> search_player --- src/web/css/maestro_main.css | 9 +++- src/web/js/maestro_main.html | 52 ------------------- src/web/js/maestro_main.js | 10 ++-- src/web/js/player_list_manager.js | 2 - src/web/module/maestro_section_main.html | 10 ++-- src/web/module/maestro_section_mouse_app.html | 21 ++++++++ src/web/module/maestro_section_search.html | 8 ++- 7 files changed, 39 insertions(+), 73 deletions(-) delete mode 100644 src/web/js/maestro_main.html create mode 100644 src/web/module/maestro_section_mouse_app.html diff --git a/src/web/css/maestro_main.css b/src/web/css/maestro_main.css index 3feacce..b3184d2 100644 --- a/src/web/css/maestro_main.css +++ b/src/web/css/maestro_main.css @@ -84,11 +84,11 @@ cursor: pointer; } -#search { +#search_player { overflow: hidden; } -#search_player { +#search_player_name { float: left; line-height: 2em; width: 400px; @@ -104,5 +104,10 @@ background-color: #ffaaaa; } +/* +#mouse_app_list { + overflow: hidden; +} +*/ \ No newline at end of file diff --git a/src/web/js/maestro_main.html b/src/web/js/maestro_main.html deleted file mode 100644 index 168a0e3..0000000 --- a/src/web/js/maestro_main.html +++ /dev/null @@ -1,52 +0,0 @@ -
-
-
    -
  • 학생 목록
  • -
  • 학생 검색
  • -
  • 마우스 앱 활성화
  • -
  • 키보드 앱 활성화
  • -
-
- - -
-
- - - -
-
- 클릭 연습
- 더블 클릭 연습
- -
-
- -
-
- 기본 자리
- 왼손 윗글쇠
- basic
- left upper
- -
- -
- - -
diff --git a/src/web/js/maestro_main.js b/src/web/js/maestro_main.js index dc72895..fb04cf2 100644 --- a/src/web/js/maestro_main.js +++ b/src/web/js/maestro_main.js @@ -27,29 +27,29 @@ function tabClicked(tabNo) { addPlayerListManager.setupAddPlayerList(); $("#section_add_player").removeClass("hide"); - $("#search").addClass("hide"); + $("#search_player").addClass("hide"); $("#mouse_app_list").addClass("hide"); $("#typing_app_list").addClass("hide"); break; case 2: $("#section_add_player").addClass("hide"); - $("#search_name").val(""); + $("#search_player_name").val(""); searchPlayerListManager.setupSearchPlayerList(""); - $("#search").removeClass("hide"); + $("#search_player").removeClass("hide"); $("#mouse_app_list").addClass("hide"); $("#typing_app_list").addClass("hide"); break; case 3: $("#section_add_player").addClass("hide"); - $("#search").addClass("hide"); + $("#search_player").addClass("hide"); $("#mouse_app_list").removeClass("hide"); $("#typing_app_list").addClass("hide"); break; case 4: $("#section_add_player").addClass("hide"); - $("#search").addClass("hide"); + $("#search_player").addClass("hide"); $("#mouse_app_list").addClass("hide"); $("#typing_app_list").removeClass("hide"); break; diff --git a/src/web/js/player_list_manager.js b/src/web/js/player_list_manager.js index 48d289c..5f4a97f 100644 --- a/src/web/js/player_list_manager.js +++ b/src/web/js/player_list_manager.js @@ -7,8 +7,6 @@ this.list = new PlayerList(this.docList, this); this.listNavigator = new PlayerListNavigator(this.docNav); - // console.log(this.list); - // console.log(this.listNavigator); this.playerCount = 0; this.activePageNo = 1; diff --git a/src/web/module/maestro_section_main.html b/src/web/module/maestro_section_main.html index ae125ad..4ce0859 100644 --- a/src/web/module/maestro_section_main.html +++ b/src/web/module/maestro_section_main.html @@ -1,7 +1,8 @@  + + + +
+ + + + + + + + + + +
\ No newline at end of file diff --git a/src/web/module/maestro_section_search.html b/src/web/module/maestro_section_search.html index d0dc8f5..2dad53a 100644 --- a/src/web/module/maestro_section_search.html +++ b/src/web/module/maestro_section_search.html @@ -5,8 +5,6 @@ $(document).ready(function() { $("#search_player_list_navigator > #page_no_area") ); - // searchPlayerList = new PlayerList($("#search_player_list")); - // searchPlayerListNavigator = new PlayerListNavigator($("#search_player_list_navigator > #page_no_area")); searchPlayerListManager.setupSearchPlayerList(""); }); @@ -16,8 +14,8 @@ function searchPlayer() { let playerName = $("#search_name").val(); if(playerName.length === 0) { - $("#add_player_notice").val("학생 이름을 입력하세요."); - $("#add_player_name").focus(); + // $("#search_name_notice").val("학생 이름을 입력하세요."); + $("#search_name").focus(); } searchPlayerListManager.setupSearchPlayerList(playerName); @@ -27,7 +25,7 @@ function searchPlayer() { - +

검색

학생 이름