공지사항 페이지 모달 양식 수정.

강석 최 2022-12-05 18:33:37 +09:00
parent d830376765
commit 97ca230737
15 changed files with 122 additions and 119 deletions

View File

@ -77,6 +77,10 @@
content: url("/img/bootstrap-icons-1.9.1/caret-down-fill.svg");
}
.f-invert{
filter: invert(100%);
}
.fs-10{
font-size: 10px;
}

View File

@ -91,6 +91,7 @@ function getEditModal(publicKey, publicType){
CrossEditor = new NamoSE('editor');
CrossEditor.params.ParentEditor = document.getElementById("editor");
CrossEditor.params.Width = "100%";
CrossEditor.params.Height = "570";
CrossEditor.params.UserLang = "auto";
CrossEditor.params.NewToolbar = true;
CrossEditor.params.UploadFileExecutePath = "/Crosseditor/uploadImg";

View File

@ -134,9 +134,9 @@
<div class="modal fade" id="authEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="authEditModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg modal-dialog-scrollable">
<div class="modal-content" id="authEditModalContent">
<div class="modal-header">
<h5 class="modal-title" id="menuEditModalLabel">권한 편집</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
<div class="modal-header bg-dark">
<h5 class="modal-title text-white" id="menuEditModalLabel">권한 편집</h5>
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<ul class="nav nav-tabs" id="userTab" role="tablist">

View File

@ -1,9 +1,9 @@
<!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
<div class="modal-header">
<h5 class="modal-title" id="menuEditModalLabel" th:text="${menuMgt.menuKey eq null?'메뉴 추가':'메뉴 수정'}"></h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
<div class="modal-header bg-dark">
<h5 class="modal-title text-white" id="menuEditModalLabel" th:text="${menuMgt.menuKey eq null?'메뉴 추가':'메뉴 수정'}"></h5>
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<form id="menuEditForm" action="#" method="post">

View File

@ -79,9 +79,9 @@
<div class="modal fade" id="authEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="authEditModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg modal-dialog-scrollable">
<div class="modal-content" id="authEditModalContent">
<div class="modal-header">
<h5 class="modal-title" id="menuEditModalLabel">권한 편집</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
<div class="modal-header bg-dark">
<h5 class="modal-title text-white" id="menuEditModalLabel">권한 편집</h5>
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">

View File

@ -136,9 +136,9 @@
<div class="modal fade" id="inoutLogModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="inoutLogModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg modal-dialog-scrollable">
<div class="modal-content" id="inoutLogModalContent">
<div class="modal-header">
<h5 class="modal-title" id="inoutLogModalLabel">로그 상세</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
<div class="modal-header bg-dark">
<h5 class="modal-title text-white" id="inoutLogModalLabel">로그 상세</h5>
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="row justify-content-start">

View File

@ -134,9 +134,9 @@
<div class="modal fade" id="requestLogModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="requestLogModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg modal-dialog-scrollable">
<div class="modal-content" id="requestLogModalContent">
<div class="modal-header">
<h5 class="modal-title" id="requestLogModalLabel">로그 상세</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
<div class="modal-header bg-dark">
<h5 class="modal-title text-white" id="requestLogModalLabel">로그 상세</h5>
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="row justify-content-start">

View File

@ -1,9 +1,9 @@
<!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org"
xmlns:sec="http://www.thymeleaf.org/thymeleaf-extras-springsecurity5">
<div class="modal-header">
<h5 class="modal-title" id="menuEditModalLabel">외사경찰 수정</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
<div class="modal-header bg-dark">
<h5 class="modal-title text-white" id="menuEditModalLabel">외사경찰 수정</h5>
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<form id="userInfoUpdate" action="#" method="post">

View File

@ -1,13 +1,13 @@
<!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
<div class="modal-header">
<h5 class="modal-title" id="menuEditModalLabel" th:text="${info.phoneKey eq null?'업무용 휴대전화 등록':'업무용 휴대전화 수정'}"></h5>
<div class="modal-header bg-dark">
<h5 class="modal-title text-white" id="menuEditModalLabel" th:text="${info.phoneKey eq null?'업무용 휴대전화 등록':'업무용 휴대전화 수정'}"></h5>
<th:block th:if="${info.phoneKey eq null}">
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</th:block>
<th:block th:unless="${info.phoneKey eq null}">
<button type="button" class="btn-close" id="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
<button type="button" class="btn-close f-invert" id="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
</th:block>
</div>
<div class="modal-body">

View File

@ -133,11 +133,10 @@
data-bs-keyboard="false" tabindex="-1"
aria-labelledby="userInsertModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg pt-5">
<div class="modal-content ">
<div class="modal-header">
<h5 class="modal-title" id="translatorInsertModalLabel">웹엑스 접속방법</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal"
aria-label="Close"></button>
<div class="modal-content">
<div class="modal-header bg-dark">
<h5 class="modal-title text-white" id="translatorInsertModalLabel">웹엑스 접속방법</h5>
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="col-auto pt-5 py-5">
<div class="text-center">

View File

@ -1,8 +1,8 @@
<!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
<div class="modal-header">
<h5 class="modal-title" id="menuEditModalLabel">등록</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
<div class="modal-header bg-dark">
<h5 class="modal-title text-white" id="menuEditModalLabel">등록</h5>
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<form id="equipEditForm" th:action="@{/equip/saveEquip}" method="post" enctype="multipart/form-data">

View File

@ -1,8 +1,8 @@
<!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
<div class="modal-header">
<h5 class="modal-title" id="sailorEditModalLabel">선원 세부 현황</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
<div class="modal-header bg-dark">
<h5 class="modal-title text-white" id="sailorEditModalLabel">선원 세부 현황</h5>
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body" id="sailorEditBody">
<form action="#" method="post" id="sailorEditForm">

View File

@ -1,9 +1,9 @@
<!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
<div class="modal-content " id="userInsertModalContent">
<div class="modal-header">
<h5 class="modal-title" id="userInsertModalLabel">사용자 신청</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
<div class="modal-header bg-dark">
<h5 class="modal-title text-white" id="userInsertModalLabel">사용자 신청</h5>
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body" th:if="${joinFlag eq 'F'}">
<div class="mb-3 mt-3 row">

View File

@ -1,10 +1,10 @@
<!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
<div class="modal-header">
<h5 class="modal-title" id="noticeEditModalLabel" th:text="${info.publicKey eq null?'공지사항 작성':'공지사항 수정'}"></h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
<div class="modal-header bg-dark">
<h5 class="modal-title text-white" id="noticeEditModalLabel" th:text="${info.publicKey eq null?'공지사항 작성':'공지사항 수정'}"></h5>
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body" id="noticeEditBody">
<div class="modal-body px-5" id="noticeEditBody">
<form action="#" method="post" id="noticeEditForm">
<input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
<input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
@ -15,18 +15,19 @@
<input type="hidden" name="wrtUserSeq" th:value="${info.wrtUserSeq}">
<input type="hidden" name="wrtUserGrd" th:value="${info.wrtUserGrd}">
<input type="hidden" name="wrtUserNm" th:value="${info.wrtUserNm}">
<div class="mb-1 row">
<label for="wrtUserNm" class="col-sm-2 col-form-label text-center">작성자</label>
<label for="wrtUserNm" class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
<div class="col-sm-2">
<th:block th:each="commonCode:${session.commonCode.get('JT')}">
<th:block th:if="${commonCode.itemCd eq info.wrtUserGrd}">
<input type="text" class="form-control" id="wrtUserNm" th:value="|${commonCode.itemValue} ${info.wrtUserNm}|" readonly>
<input type="text" class="form-control form-control-sm" id="wrtUserNm" th:value="|${commonCode.itemValue} ${info.wrtUserNm}|" readonly>
</th:block>
</th:block>
</div>
<label for="wrtDt" class="col-sm-2 col-form-label text-center">작성일시</label>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">작성일시</label>
<div class="col-sm-2">
<input type="text" class="form-control" id="wrtDt" name="wrtDt" th:value="${#temporals.format(info.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly>
<input type="text" class="form-control form-control-sm" id="wrtDt" name="wrtDt" th:value="${#temporals.format(info.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly>
</div>
<div class="col-sm-auto my-auto">
<input type="checkbox" id="organChk" name="organChk" value="T" th:checked="${info.organChk eq 'T'}">
@ -34,24 +35,24 @@
<label for="organChk" class="col-sm-3 col-form-label text-left">소속관서에만 노출</label>
</div>
<div class="mb-1 row">
<label for="title" class="col-sm-2 col-form-label text-center">제목</label>
<label for="title" class="col-sm-1 col-form-label col-form-label-sm text-center">제목</label>
<div class="col-sm-10">
<input type="text" class="form-control" id="title" name="title" th:value="${info.title}" autocomplete="off">
<input type="text" class="form-control form-control-sm" id="title" name="title" th:value="${info.title}" autocomplete="off">
</div>
</div>
<div class="mb-1 row justify-content-center">
<label for="editor" class="col-sm-2 col-form-label text-center">내용</label>
<div class="mb-1 row">
<label for="editor" class="col-sm-1 col-form-label col-form-label-sm text-center">내용</label>
<div class="col-sm-10">
<div id="editor"></div>
<textarea id="content" class="d-none" th:utext="${info.content}"></textarea>
</div>
</div>
<div class="row mb-1">
<label for="fileInputer" class="col-sm-2 col-form-label text-center">업로드 자료</label>
<label for="fileInputer" class="col-sm-1 col-form-label col-form-label-sm text-center">업로드 자료</label>
<div class="col-sm-10" style="min-height: 70px;">
<div class="w-100 h-100 border border-info rounded text-center" id="uploadDiv">
<th:block th:if="${#arrays.isEmpty(info.fileList)}">
<br>파일을 업로드 해주세요.
<br>클릭 또는 드레그하여 파일을 업로드 해주세요.
</th:block>
<th:block th:unless="${#arrays.isEmpty(info.fileList)}">
<div class='row-col-6' th:each="infoFile:${info.fileList}">
@ -65,7 +66,7 @@
</div>
</form>
</div>
<div class="modal-footer">
<div class="modal-footer bg-light">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
<button type="button" class="btn btn-primary" id="saveBtn">저장</button>
</div>

View File

@ -1,50 +1,47 @@
<!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
<div class="modal-header">
<h5 class="modal-title" id="publicViewModalLabel">공지사항 열람</h5>
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
<div class="modal-header bg-dark">
<h5 class="modal-title text-white" id="publicViewModalLabel">공지사항 열람</h5>
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</div>
<div class="modal-body">
<div class="row">
<div class="col-12">
<input type="hidden" name="publicKeyKey" id="viewModalPublicKey" th:value="${info.publicKey}">
<div class="row mb-1">
<label for="wrtUserNm" class="col-sm-1 col-form-label text-center">작성자</label>
<div class="col-sm-2">
<th:block th:each="commonCode:${session.commonCode.get('JT')}">
<th:block th:if="${commonCode.itemCd eq info.wrtUserGrd}">
<input type="text" class="form-control border-0" id="wrtUserNm" name="wrtUserNm" th:value="|${commonCode.itemValue} ${info.wrtUserNm}|" readonly>
</th:block>
</th:block>
</div>
<label for="wrtDt" class="col-sm-1 col-form-label text-center">작성일시</label>
<div class="col-sm-2">
<input type="text" class="form-control border-0" id="wrtDt" name="wrtDt" th:value="${#temporals.format(info.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly>
</div>
<div class="col-sm-auto my-auto">
<input type="checkbox" id="organChk" name="organChk" th:checked="${info.organChk eq 'T'}" disabled>
</div>
<label for="organChk" class="col-sm-2 col-form-label text-left">소속관서에만 노출</label>
</div>
<hr>
<hr class="my-1">
<div class="row">
<div class="col-8">
<div class="row mb-1">
<label for="title" class="col-sm-2 col-form-label text-center">제목</label>
<div class="col-sm-10">
<input type="text" class="form-control border-0" id="title" name="title" th:value="${info.title}" readonly>
<div class="col-sm-9"></div>
<label for="wrtDt" class="col-sm-1 col-form-label col-form-label-sm text-center">작성일시</label>
<div class="col-sm-2">
<input type="text" class=" form-control form-control-sm border-0" id="wrtDt" name="wrtDt" th:value="${#temporals.format(info.wrtDt, 'yyyy-MM-dd HH:mm')}" readonly>
</div>
<label for="title" class="col-sm-1 col-form-label col-form-label-sm text-center">제목</label>
<div class="col-sm-8">
<input type="text" class=" form-control form-control-sm border-0" id="title" name="title" th:value="${info.title}" readonly>
</div>
<label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
<div class="col-sm-2 form-control-sm">
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
<th:block th:if="${commonCode.itemCd eq info.wrtOrgan}" th:text="${commonCode.itemValue}"></th:block>
</th:block>
<th:block th:each="commonCode:${session.commonCode.get('JT')}">
<th:block th:if="${commonCode.itemCd eq info.wrtUserGrd}" th:text="${commonCode.itemValue}"></th:block>
</th:block>
<th:block th:text="${info.wrtUserNm}"></th:block>
</div>
</div>
<hr>
<hr class="my-1">
<div class="row mb-1">
<label for="content" class="col-sm-2 col-form-label text-center">내용</label>
<div class="col-sm-10">
<label for="content" class="col-sm-1 col-form-label col-form-label-sm text-center">내용</label>
<div class="col-sm-10 form-control-sm">
<div id="content" th:utext="${info.content}"></div>
</div>
</div>
</div>
<div class="col-4">
<table class="table">
<div class="col-4 border-start">
<table class="table table-sm">
<thead>
<tr>
<th>파일명</th>
@ -71,33 +68,35 @@
</div>
</div>
</div>
<hr>
</div>
<hr class="my-1">
<div class="row justify-content-start">
<div class="col-12" id="commentFormHome">
<form action="#" method="post" id="commentForm">
<div class="row">
<div class="col-11">
<div class="row mx-3">
<div class="col-6">
<input type="hidden" name="publicKey" th:value="${info.publicKey}">
<input type="hidden" name="parentComment" id="parentComment">
<input type="text" class="form-control form-control-sm" id="comment" name="comment" placeholder="댓글작성">
<input type="text" class=" form-control form-control-sm" id="comment" name="comment" placeholder="댓글작성">
</div>
<div class="col-auto m-auto">
<div class="col-auto">
<input type="button" class="btn btn-sm btn-primary" id="commentSaveBtn" value="작성">
<input type="button" class="btn btn-sm btn-warning" id="childFormRemoveBtn" value="취소" style="display: none">
</div>
</div>
</form>
</div>
<div class="col-12 pt-3" id="commentDiv">
<div class="col-12 form-control-sm pt-2" id="commentDiv">
<th:block th:each="comment:${info.commentList}">
<div class="row justify-content-start commentRow">
<div class="row justify-content-start mx-3 commentRow">
<input type="hidden" class="publicKey" th:value="${comment.publicKey}">
<input type="hidden" class="commentKey" th:value="${comment.commentKey}">
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
<div class="col-auto" th:if="${commonCode.itemCd eq comment.wrtOrgan}" th:text="${commonCode.itemValue}"></div>
</th:block>
<th:block th:each="commonCode:${session.commonCode.get('OFC')}">
<!--<th:block th:each="commonCode:${session.commonCode.get('OFC')}">
<div class="col-auto" th:if="${commonCode.itemCd eq comment.wrtPart}" th:text="${commonCode.itemValue}"></div>
</th:block>
</th:block>-->
<th:block th:each="commonCode:${session.commonCode.get('JT')}">
<div class="col-auto" th:if="${commonCode.itemCd eq comment.wrtUserGrd}" th:text="${commonCode.itemValue}"></div>
</th:block>
@ -111,42 +110,41 @@
</div>
<div class="col-12" th:utext="${comment.comment}"></div>
<div class="col-12 childCommentDiv" style="display: none"></div>
<hr>
</div>
<th:block th:each="childComment:${comment.childCommentList}">
<div class="row justify-content-start">
<div class="col-auto">
<i class="bi bi-arrow-return-right" ></i>
</div>
<div class="col-auto">
<div class="row justify-content-start commentRow">
<input type="hidden" class="publicKey" th:value="${childComment.publicKey}">
<input type="hidden" class="commentKey" th:value="${childComment.commentKey}">
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
<div class="col-auto" th:if="${commonCode.itemCd eq childComment.wrtOrgan}" th:text="${commonCode.itemValue}"></div>
</th:block>
<th:block th:each="commonCode:${session.commonCode.get('OFC')}">
<div class="col-auto" th:if="${commonCode.itemCd eq childComment.wrtPart}" th:text="${commonCode.itemValue}"></div>
</th:block>
<th:block th:each="commonCode:${session.commonCode.get('JT')}">
<div class="col-auto" th:if="${commonCode.itemCd eq childComment.wrtUserGrd}" th:text="${commonCode.itemValue}"></div>
</th:block>
<div class="col-auto" th:text="${childComment.wrtUserNm}"></div>
<div class="col-auto" th:text="|작성일시: ${#temporals.format(childComment.wrtDt, 'yyyy-MM-dd HH:mm')}|"></div>
<div class="col-auto" th:if="${userSeq eq childComment.wrtUserSeq}">
<button type="button" class="btn btn-sm btn-danger deleteCommentBtn">댓글삭제</button>
<th:block th:each="childComment:${comment.childCommentList}">
<div class="row justify-content-start my-1">
<div class="col-auto">
<i class="bi bi-arrow-return-right" ></i>
</div>
<div class="col-auto">
<div class="row justify-content-start commentRow">
<input type="hidden" class="publicKey" th:value="${childComment.publicKey}">
<input type="hidden" class="commentKey" th:value="${childComment.commentKey}">
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
<div class="col-auto" th:if="${commonCode.itemCd eq childComment.wrtOrgan}" th:text="${commonCode.itemValue}"></div>
</th:block>
<!--<th:block th:each="commonCode:${session.commonCode.get('OFC')}">
<div class="col-auto" th:if="${commonCode.itemCd eq childComment.wrtPart}" th:text="${commonCode.itemValue}"></div>
</th:block>-->
<th:block th:each="commonCode:${session.commonCode.get('JT')}">
<div class="col-auto" th:if="${commonCode.itemCd eq childComment.wrtUserGrd}" th:text="${commonCode.itemValue}"></div>
</th:block>
<div class="col-auto" th:text="${childComment.wrtUserNm}"></div>
<div class="col-auto" th:text="|작성일시: ${#temporals.format(childComment.wrtDt, 'yyyy-MM-dd HH:mm')}|"></div>
<div class="col-auto" th:if="${userSeq eq childComment.wrtUserSeq}">
<button type="button" class="btn btn-sm btn-danger deleteCommentBtn">댓글삭제</button>
</div>
<div class="col-12" th:utext="${childComment.comment}"></div>
</div>
<div class="col-12" th:utext="${childComment.comment}"></div>
</div>
</div>
<hr>
</div>
</th:block>
</th:block>
<hr class="my-1">
</div>
</th:block>
</div>
</div>
</div>
<div class="modal-footer">
<div class="modal-footer bg-light">
<th:block th:if="${userSeq eq info.wrtUserSeq}"><!--작성자일 경우 수정 허용-->
<button type="button" class="btn btn-warning" id="editBtn">수정</button>
</th:block>