From 933497b76626db4f201fc5e515fdf28305e92006 Mon Sep 17 00:00:00 2001
From: "DESKTOP-QGC5RJO\\DBNT" <yrseo@dbnt.co.kr>
Date: Mon, 25 Apr 2022 14:18:11 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=ED=8E=98=EC=9D=B4=EC=A7=80=20=EA=B0=9C=EC=9D=B8?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4/=EA=B6=8C=ED=95=9C=EC=9D=84=20=EB=AA=A8?=
 =?UTF-8?q?=EB=8B=AC=EB=A1=9C=20=EB=B3=80=EA=B2=BD=EB=B0=8F=20=EB=AA=A8?=
 =?UTF-8?q?=EB=8B=AC=EC=82=AC=EC=9D=B4=EC=A6=88=20=EC=A1=B0=EC=A0=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/static/js/admin/userMgt.js |  2 +
 .../resources/templates/admin/userMgt.html    | 53 +++++++++++--------
 .../resources/templates/layout/layout.html    |  4 +-
 3 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/src/main/resources/static/js/admin/userMgt.js b/src/main/resources/static/js/admin/userMgt.js
index 16a8ccf..8d67307 100644
--- a/src/main/resources/static/js/admin/userMgt.js
+++ b/src/main/resources/static/js/admin/userMgt.js
@@ -188,6 +188,7 @@ function getUserInfo(userSeq){
       dataType:"html",
       success: function(html){
         $("#userContent").empty().append(html)
+        $("#userInfoModal").modal('show')
       },
       error:function(){
 
@@ -204,6 +205,7 @@ function getCategoryRole(userSeq){
       dataType:"html",
       success: function(html){
         $("#userContent").empty().append(html)
+        $("#userInfoModal").modal('show')
       },
       error:function(){
 
diff --git a/src/main/resources/templates/admin/userMgt.html b/src/main/resources/templates/admin/userMgt.html
index 484149a..1fee6d7 100644
--- a/src/main/resources/templates/admin/userMgt.html
+++ b/src/main/resources/templates/admin/userMgt.html
@@ -16,7 +16,7 @@
       <div class="col-12 card text-center">
         <div class="card-body">
           <div class="row justify-content-start">
-            <div class="col-xl-7">
+            <div class="col-12">
               <form method="get" th:action="@{/admin/userMgt}">
                 <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
                 <div class="row justify-content-between">
@@ -138,22 +138,7 @@
                   </nav>
                 </div>
                 <div class="col-auto">
-                  <input type="button" class="btn btn-success" value="사용자 생성" data-bs-toggle="modal" data-bs-target="#userInfoModal">
-                </div>
-              </div>
-            </div>
-            <div class="col-xl-5">
-              <ul class="nav nav-tabs" id="userTab" role="tablist">
-                <li class="nav-item" role="presentation">
-                  <button class="nav-link active" id="infoTab" data-bs-toggle="tab" type="button" role="tab">개인정보</button>
-                </li>
-                <li class="nav-item" role="presentation">
-                  <button class="nav-link" id="categoryTab" data-bs-toggle="tab" type="button" role="tab">권한</button>
-                </li>
-              </ul>
-              <div class="tab-content border border-top-0" id="userContent">
-                <div class="py-5">
-                  <h3>목록에서 선택해주세요.</h3>
+                  <input type="button" class="btn btn-success" value="사용자 생성" data-bs-toggle="modal" data-bs-target="#userInsertModal">
                 </div>
               </div>
             </div>
@@ -163,11 +148,11 @@
     </div>
   </main>
 
-  <div class="modal fade" id="userInfoModal" tabindex="-1" aria-labelledby="userInfoModalLabel" aria-hidden="true">
-    <div class="modal-dialog modal-xl">
-      <div class="modal-content">
+  <div class="modal fade" id="userInsertModal" tabindex="-1" aria-labelledby="userInsertModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content ">
         <div class="modal-header">
-          <h5 class="modal-title" id="userInfoModalLabel">사용자 생성</h5>
+          <h5 class="modal-title" id="userInsertModalLabel">사용자 생성</h5>
           <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
         </div>
         <div  class="modal-body">
@@ -239,5 +224,31 @@
       </div>
     </div>
   </div>
+
+  <div class="modal fade" id="userInfoModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h5 class="modal-title" id="staticBackdropLabel">Modal title</h5>
+          <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+        </div>
+        <div class="modal-body">
+          <ul class="nav nav-tabs" id="userTab" role="tablist">
+            <li class="nav-item" role="presentation">
+              <button class="nav-link active" id="infoTab" data-bs-toggle="tab" type="button" role="tab">개인정보</button>
+            </li>
+            <li class="nav-item" role="presentation">
+              <button class="nav-link" id="categoryTab" data-bs-toggle="tab" type="button" role="tab">권한</button>
+            </li>
+          </ul>
+          <div class="tab-content border border-top-0" id="userContent">
+            <div class="py-5">
+              <h3>목록에서 선택해주세요.</h3>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/layout/layout.html b/src/main/resources/templates/layout/layout.html
index 382b4f3..f9985c2 100644
--- a/src/main/resources/templates/layout/layout.html
+++ b/src/main/resources/templates/layout/layout.html
@@ -51,10 +51,10 @@
   <header th:replace="fragments/header :: headerFragment"></header>
   <div class="h-100" sec:authorize="isAnonymous()" layout:fragment="content"></div>
   <div sec:authorize="isAuthenticated()" class="row mx-0">
-    <div class="sidebar col-2 centerDiv border-end">
+    <div class="sidebar col-2 d-lg-block d-none centerDiv border-end">
       <div th:replace="fragments/leftMenu :: leftMenuFragment"></div>
     </div>
-    <div class="col-10 centerDiv">
+    <div class="col-12 col-lg-10 centerDiv">
       <div layout:fragment="content"></div>
     </div>
   </div>