Bläddra i källkod

Merge remote-tracking branch 'TSIT/ST24PRJ-3' into develop

card007 4 år sedan
förälder
incheckning
3b73b7a40e

+ 25 - 0
src/main/webapp/WEB-INF/views/common/layout/popup.html

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="ko"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
+
+<head th:replace="~{common/fragments/header :: header}"></head>
+
+<body>
+
+<th:block th:replace="~{common/fragments/variables :: variables}"></th:block>
+
+<div id="wrapper" class="color-pastel">
+	<th:block layout:fragment="content"></th:block>
+</div>
+
+<script th:inline="javascript">
+/*<![CDATA[*/
+	$(document).ready(function() {
+		
+	});
+/*]]>*/
+</script>
+
+</body>
+</html>

+ 4 - 2
src/main/webapp/WEB-INF/views/customer/OneToOneQnaDetailForm.html

@@ -14,7 +14,7 @@
  * 1.0  2020.12.24   gagamel     최초 작성
  *******************************************************************************
  -->
-<div class="modalPopup" data-width="1200" data-height="900" id="popupOneToOneQnaDetail">
+<div class="modelessPopup draggable" data-width="1200" data-height="900" id="popupOneToOneQnaDetail">
 	<div class="panelStyle">
 		<!-- TITLE -->
 		<div class="panelTitle">
@@ -127,7 +127,7 @@
 								<span id="dpLocAnsContent">0</span>/4,000Byte
 							</th>
 							<td>
-								<textarea class="textareaR4" style="resize: none;" name="ansContent" th:text="*{ansContent}" onkeyup="cfnGetTextLength(this, 4000, $('#dpLocAnsContent'));" required="required" data-valid-name="답변 내용"></textarea>
+								<textarea class="textareaR15" style="resize: none;" name="ansContent" th:text="*{ansContent}" onkeyup="cfnGetTextLength(this, 4000, $('#dpLocAnsContent'));" required="required" data-valid-name="답변 내용"></textarea>
 							</td>
 						</tr>
 					</tbody>
@@ -471,6 +471,8 @@
 		fnSearchOneToOneCustomerHistory();
 		
 		fnShowOrHideOneToOneQnaButton([[${counselInfo.ansStat}]]);
+		
+		$('#popupOneToOneQnaDetail .modelessPopup').draggable({'cancel':'.panelContent'});
 	});
 /*]]>*/
 </script>

+ 3 - 3
src/main/webapp/WEB-INF/views/customer/OneToOneQnaForm.html

@@ -14,7 +14,7 @@
  * 1.0  2020.12.24   gagamel     최초 작성
  *******************************************************************************
  -->
-	<div id="main">
+<div id="main">
 	<form id="searchForm" name="searchForm" action="#" th:action="@{'/customer/onetoone/qna/list'}" onsubmit="$('#btnSearch').trigger('click'); return false;">
 		<!-- 메인타이틀 영역 -->
 		<div class="main-title">
@@ -132,8 +132,8 @@
 			</ul>
 		</div>
 		<!-- //리스트 영역 -->
-		</form>
-	</div>
+	</form>
+</div>
 
 <script type="text/javascript" src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">

+ 1 - 0
src/main/webapp/ux/css/admin.ui.css

@@ -28,6 +28,7 @@ textarea {overflow:auto; resize:vertical; width:100%; margin:4px 0; vertical-ali
 .textareaR2 {min-height:60px; line-height:26px;}
 .textareaR3 {min-height:96px; line-height:26px;}
 .textareaR4 {min-height:134px; line-height:26px;}
+.textareaR15 {min-height:400px; line-height:26px;}
 .byteChk {line-height:20px; padding-left:20px; display:inline-block; vertical-align:middle;}
 select {margin:0 3px 1px 0; padding:3px 10px 3px 3px; color:inherit; border-radius:1px; vertical-align:middle;}
 select, input[type=text], input[type=file], input[type=date], input[type=password], textarea {border:1px solid #dbdbdb;}