DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://dev.azure.com/DBNTech/ForeignAffairs/_git/ForeignAffairs

master
강석 최 2023-01-20 16:53:42 +09:00
parent 3b0e65702a 2ba97d3256
commit 24cb233d87
15 changed files with 192 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/resources/static/css/common.css
View File

@ -150,8 +150,11 @@
background-color: #253660;
z-index: 100;
}
#footer{
z-index: 1;
#wrapper{
min-height: 91%;
}
.footer{
transform : translateY(91%);
}
.bg-label{
background-color: lightblue;
@ -174,9 +177,19 @@
color: #24396c;
text-align: center;
}
.col-form-label-sm.text-center {
background-color: #aabfe178;
border: 1px solid rgba(var(--bs-secondary-rgb))!important;
}
.col-form-label-sm.text-start, .col-sm-11.form-control-sm, .col-sm-10.form-control-sm{
border: 1px solid rgba(var(--bs-secondary-rgb))!important;
}
@font-face {font-family:'GmarketSansMedium';src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2001@1.1/GmarketSansMedium.woff') format('woff');}
.dash-title
@ -184,3 +197,7 @@
font-family: 'GmarketSansMedium';
font-size: 18px;
}
.bg-light.text-center{
background-color: #deebff78!important;
}

BIN
src/main/resources/static/img/logoNew.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

56
src/main/resources/templates/fragments/footer.html
View File

@ -1,20 +1,20 @@
<!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
<footer th:fragment="footerFragment" class="d-flex flex-wrap py-2 mt-auto">
<div class="row mx-3">
<div class="col-auto">
<img th:src="@{/img/ft_logo.png}" alt="logo" title="logo" style="height: 40px;"/>
</div>
<div class="col-auto row">
<div class="col-12">
<span class="text-muted">21995 인천광역시 연수구 해돋이로 130 해양경찰청</span>
</div>
<div class="col-12">
<span class="text-muted">COPYRIGHT(C)2022 MINISTRY OF REPUBLIC ADMINISTRATION AND SECURITY. ALL RIGHT RESERVED</span>
</div>
</div>
</div>
</footer>
<!-- <footer th:fragment="footerFragment" class="d-flex flex-wrap py-2 mt-auto">-->
<!-- <div class="row mx-3">-->
<!-- <div class="col-auto">-->
<!-- <img th:src="@{/img/ft_logo.png}" alt="logo" title="logo" style="height: 40px;"/>-->
<!-- </div>-->
<!-- <div class="col-auto row">-->
<!-- <div class="col-12">-->
<!-- <span class="text-muted">21995 인천광역시 연수구 해돋이로 130 해양경찰청</span>-->
<!-- </div>-->
<!-- <div class="col-12">-->
<!-- <span class="text-muted">COPYRIGHT(C)2022 MINISTRY OF REPUBLIC ADMINISTRATION AND SECURITY. ALL RIGHT RESERVED</span>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </footer>-->
<!--<div id="footer" th:fragment="footerFragment" class="d-flex flex-wrap border-top">
@ -29,17 +29,17 @@
</div>-->
<!--<div class="row w-100 mt-3 justify-content-center" id="footerRow" th:fragment="footerFragment">-->
<!-- <div class="col-auto">-->
<!-- <img src="/img/ft_logo.png" alt="사이버외사정보시스템로고" class="h-75">-->
<!-- </div>-->
<!-- <div class="col-auto">-->
<!-- <p id="footerSiteName">사이버외사정보시스템</p>-->
<!-- <span id="footerSiteNameEng">FOREIGN AFFAIRS INTELLIGENCE CYBER SYSTEM</span>-->
<!-- </div>-->
<!-- <div class="col-auto">-->
<!-- <p class="mb-1">21995 인천광역시 연수구 해돋이로 130 해양경찰청</p>-->
<!-- <p class="mb-1">Copyright ⓒ 2011 MINISTRY OF REPUBLIC ADMINISTRATION AND SECURITY. All right reserved.</p>-->
<!-- </div>-->
<!--</div>-->
<div class="d-flex flex-wrap py-2 mt-auto" id="footerRow" th:fragment="footerFragment">
<div class="col-auto">
<img src="/img/ft_logo.png" alt="사이버외사정보시스템로고" class="h-75">
</div>
<div class="col-auto">
<p id="footerSiteName">사이버외사정보시스템</p>
<span id="footerSiteNameEng">FOREIGN AFFAIRS INTELLIGENCE CYBER SYSTEM</span>
</div>
<div class="col-auto">
<p class="mb-1">21995 인천광역시 연수구 해돋이로 130 해양경찰청</p>
<p class="mb-1">Copyright ⓒ 2011 MINISTRY OF REPUBLIC ADMINISTRATION AND SECURITY. All right reserved.</p>
</div>
</div>
</html>

2
src/main/resources/templates/fragments/header.html
View File

@ -6,9 +6,7 @@
<div class="col-auto row justify-content-start">
<div class="col-auto">
<div class="navbar-header">
<a href="/" class="navbar-brand">
<img id="logo" th:src="@{/img/logo2.png}" alt="logo" title="logo" sec:authorize="isAnonymous()">
</a>
</div>
</div>
<div class="col-auto my-auto">

8
src/main/resources/templates/fragments/leftMenu.html
View File

@ -1,11 +1,13 @@
<!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org">
<div class="pt-3" th:fragment="leftMenuFragment">
<div>
<div class="ps-5">
<a href="/" >
<img id="logoNew" th:src="@{/img/logoNew.png}" alt="logoNew" title="logoNew">
</a>
</div>
<div class="flex-shrink-0 py-3 bg-transparent" id="leftMenu">
<ul class="list-unstyled ps-0">
<ul class="list-unstyled border-top border-secondary ps-0">
<li class="mb-1 border-bottom border-secondary" th:each="firstMenu:${session.menuList}">
<th:block th:each="cat1Code:${session.commonCode.get('CAT1')}">
<th:block th:if="${cat1Code.itemCd eq firstMenu.cat1Cd}">

19
src/main/resources/templates/layout/layout.html
View File

@ -27,8 +27,10 @@
<!--bootstrap-->
<script type="text/javascript" th:src="@{/vendor/bootstrap-5.2.0-dist/js/bootstrap.bundle.min.js}"></script>
<!--bootstrap-datepicker-->
<script type="text/javascript" th:src="@{/vendor/bootstrap-datepicker-1.9.0-dist/js/bootstrap-datepicker.min.js}"></script>
<script type="text/javascript" th:src="@{/vendor/bootstrap-datepicker-1.9.0-dist/locales/bootstrap-datepicker.ko.min.js}"></script>
<script type="text/javascript"
th:src="@{/vendor/bootstrap-datepicker-1.9.0-dist/js/bootstrap-datepicker.min.js}"></script>
<script type="text/javascript"
th:src="@{/vendor/bootstrap-datepicker-1.9.0-dist/locales/bootstrap-datepicker.ko.min.js}"></script>
<!--datetimepicker-->
<script type="text/javascript" th:src="@{/vendor/datetimepicker/js/datetimepicker.full.min.js}"></script>
<script type="text/javascript" th:src="@{/vendor/datetimepicker/js/datetimepicker.js}"></script>
@ -73,20 +75,21 @@
</div>
</div>-->
<div class="d-flex flex-nowrap h-100" sec:authorize="isAnonymous()">
<div class="flex-shrink-0 overflow-auto w-100" style="background-color: #f8f8f8;">
<div class="flex-shrink-0 overflow-auto w-100 bg-light">
<header th:replace="fragments/header :: headerFragment"></header>
<div layout:fragment="content"></div>
<div th:replace="fragments/footer :: footerFragment"></div>
</div>
</div>
<div class="d-flex flex-nowrap h-100" sec:authorize="isAuthenticated()">
<div class="flex-shrink-0 bg-leftMenu border-end overflow-auto" style="width: 260px;">
<div class="bg-leftMenu border-end overflow-auto" style="width: 260px;">
<div th:replace="fragments/leftMenu :: leftMenuFragment"></div>
</div>
<div class="flex-shrink-0 overflow-auto" style="width: 1660px;">
<div class=" overflow-auto" style="width: 1660px;">
<div class="bg-light" id="wrapper" >
<header th:replace="fragments/header :: headerFragment"></header>
<div class="bg-light px-3 py-2" layout:fragment="content"></div>
<div th:replace="fragments/footer :: footerFragment"></div>
<div class="px-3 py-2" layout:fragment="content"></div>
</div>
<div class="footer" th:replace="fragments/footer :: footerFragment"></div>
</div>
</div>
<div id="fadeDiv" style="display: none;">

10
src/main/resources/templates/publicBoard/board/boardEditModal.html
View File

@ -16,7 +16,7 @@
<input type="hidden" name="wrtUserGrd" th:value="${info.wrtUserGrd}">
<input type="hidden" name="wrtUserNm" th:value="${info.wrtUserNm}">
<div class="row mb-1">
<label for="wrtUserNm" class="col-sm-2 col-form-label text-center">작성자</label>
<label for="wrtUserNm" class="col-sm-2 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}">
@ -24,7 +24,7 @@
</th:block>
</th:block>
</div>
<label for="wrtDt" class="col-sm-2 col-form-label text-center">작성일시</label>
<label for="wrtDt" class="col-sm-2 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>
</div>
@ -34,20 +34,20 @@
<label for="organChk" class="col-sm-3 col-form-label text-left">소속관서에만 노출</label>
</div>
<div class="row mb-1">
<label for="title" class="col-sm-2 col-form-label text-center">제목</label>
<label for="title" class="col-sm-2 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">
</div>
</div>
<div class="row mb-1 justify-content-center">
<label for="content" class="col-sm-2 col-form-label text-center">내용</label>
<label for="content" class="col-sm-2 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-3">
<label for="fileInputer" class="col-sm-2 col-form-label text-center">첨부파일</label>
<label for="fileInputer" class="col-sm-2 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)}">

4
src/main/resources/templates/publicBoard/board/boardPage.html
View File

@ -61,7 +61,7 @@
<div class="col-12">
<table class="table table-sm table-hover table-bordered">
<thead>
<tr class="table-secondary">
<tr class="table-color">
<th></th>
<th>제목</th>
<th>관서</th>
@ -77,7 +77,7 @@
<tr class="planTr" th:each="board:${boardList}">
<input type="hidden" class="planKey" th:value="${board.publicKey}">
<td><input type="checkbox" class="trChkBox"></td>
<td th:text="${board.title}"></td>
<td align="left" th:text="${board.title}"></td>
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
<td th:if="${board.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
</th:block>

8
src/main/resources/templates/publicBoard/board/boardViewModal.html
View File

@ -17,11 +17,11 @@
<div class="tab-content bg-white border border-top-0 p-2">
<div class="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0">
<div class="row mb-1">
<div class="col-sm-9"></div>
<div class="col-sm-0"></div>
<label class="col-sm-1 col-form-label col-form-label-sm text-center">제목</label>
<label class="col-sm-5 col-form-label col-form-label-sm text-start" th:text="${info.title}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center">작성일시</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(info.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center">제목</label>
<label class="col-sm-8 col-form-label col-form-label-sm text-start" th:text="${info.title}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start">
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
@ -34,7 +34,7 @@
</label>
<hr class="my-1">
<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 class="col-sm-11 form-control-sm">
<div id="content" th:utext="${info.content}"></div>
</div>
</div>

8
src/main/resources/templates/publicBoard/notice/noticeViewModal.html
View File

@ -17,11 +17,11 @@
<div class="tab-content bg-white border border-top-0 p-2">
<div class="tab-pane fade p-2 show active" id="boardTabPanel" role="tabpanel" tabindex="0">
<div class="row mb-1">
<div class="col-sm-9"></div>
<div class="col-sm-0"></div>
<label class="col-sm-1 col-form-label col-form-label-sm text-center bg-lightB">제목</label>
<label class="col-sm-5 col-form-label col-form-label-sm text-start" th:text="${info.title}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center bg-lightB">작성일시</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(info.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center bg-lightB">제목</label>
<label class="col-sm-8 col-form-label col-form-label-sm text-start" th:text="${info.title}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center bg-lightB">작성자</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start">
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
@ -34,7 +34,7 @@
</label>
<hr class="my-1">
<label for="content" class="col-sm-1 col-form-label col-form-label-sm text-center bg-lightB">내용</label>
<div class="col-sm-10 form-control-sm">
<div class="col-sm-11 form-control-sm">
<div id="content" th:utext="${info.content}"></div>
</div>
</div>

10
src/main/resources/templates/publicBoard/qna/qnaEditModal.html
View File

@ -16,7 +16,7 @@
<input type="hidden" name="wrtUserGrd" th:value="${info.wrtUserGrd}">
<input type="hidden" name="wrtUserNm" th:value="${info.wrtUserNm}">
<div class="row mb-1">
<label for="wrtUserNm" class="col-sm-2 col-form-label text-center">작성자</label>
<label for="wrtUserNm" class="col-sm-2 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}">
@ -24,7 +24,7 @@
</th:block>
</th:block>
</div>
<label for="wrtDt" class="col-sm-2 col-form-label text-center">작성일시</label>
<label for="wrtDt" class="col-sm-2 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>
</div>
@ -34,20 +34,20 @@
<label for="organChk" class="col-sm-3 col-form-label text-left">소속관서에만 노출</label>
</div>
<div class="row mb-1">
<label for="title" class="col-sm-2 col-form-label text-center">제목</label>
<label for="title" class="col-sm-2 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">
</div>
</div>
<div class="row mb-1 justify-content-center">
<label for="content" class="col-sm-2 col-form-label text-center">내용</label>
<label for="content" class="col-sm-2 col-form-label-sm align-items-center 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-3">
<label for="fileInputer" class="col-sm-2 col-form-label text-center">첨부파일</label>
<label for="fileInputer" class="col-sm-2 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)}">

4
src/main/resources/templates/publicBoard/qna/qnaPage.html
View File

@ -62,7 +62,7 @@
<div class="col-12">
<table class="table table-sm table-hover table-bordered">
<thead>
<tr class="table-secondary">
<tr class="table-color">
<th></th>
<th>제목</th>
<th>관서</th>
@ -78,7 +78,7 @@
<tr class="planTr" th:each="qna:${qnaList}">
<input type="hidden" class="planKey" th:value="${qna.publicKey}">
<td><input type="checkbox" class="trChkBox"></td>
<td th:text="${qna.title}"></td>
<td align="left" th:text="${qna.title}"></td>
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
<td th:if="${qna.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
</th:block>

20
src/main/resources/templates/publicBoard/qna/qnaViewModal.html
View File

@ -17,13 +17,13 @@
<div class="tab-content bg-white border border-top-0 p-2">
<div class="tab-pane fade p-2 show active " id="boardTabPanel" role="tabpanel" tabindex="0">
<div class="row mb-1">
<div class="col-sm-9"></div>
<label class="col-sm-1 col-form-label col-form-label-sm text-center">작성일시</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(info.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center">제목</label>
<label class="col-sm-8 col-form-label col-form-label-sm text-start" th:text="${info.title}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start">
<div class="col-sm-0"></div>
<label class="col-sm-1 col-form-label col-form-label-sm text-center border border-secondary">제목</label>
<label class="col-sm-4 col-form-label col-form-label-sm text-start border border-secondary" th:text="${info.title}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center border border-secondary">작성일시</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start border border-secondary" th:text="${#temporals.format(info.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center border border-secondary">작성자</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start border border-secondary">
<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>
@ -33,9 +33,9 @@
<th:block th:text="${info.wrtUserNm}"></th:block>
</label>
<hr class="my-1">
<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>
<label for="content border border-secondary" class="col-sm-1 col-form-label col-form-label-sm text-center border border-secondary">내용</label>
<div class="col-sm-10 form-control-sm border border-secondary">
<div id="content border border-secondary" th:utext="${info.content}"></div>
</div>
</div>
</div>

4
src/main/resources/templates/publicBoard/reference/referencePage.html
View File

@ -67,7 +67,7 @@
<div class="col-12">
<table class="table table-sm table-hover table-bordered">
<thead>
<tr class="table-secondary">
<tr class="table-color">
<th></th>
<th>제목</th>
<th>관서</th>
@ -83,7 +83,7 @@
<tr class="planTr" th:each="reference:${referenceList}">
<input type="hidden" class="planKey" th:value="${reference.publicKey}">
<td><input type="checkbox" class="trChkBox"></td>
<td th:text="${reference.title}"></td>
<td align="left" th:text="${reference.title}"></td>
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
<td th:if="${reference.wrtOrgan eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
</th:block>

8
src/main/resources/templates/publicBoard/reference/referenceViewModal.html
View File

@ -23,11 +23,11 @@
<th:block th:if="${code.itemCd eq info.tabStatus}" th:text="${code.itemValue}"></th:block>
</th:block>
</label>
<div class="col-sm-7"></div>
<div class="col-sm-0"></div>
<label class="col-sm-1 col-form-label col-form-label-sm text-center">제목</label>
<label class="col-sm-5 col-form-label col-form-label-sm text-start" th:text="${info.title}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center">작성일시</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(info.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center">제목</label>
<label class="col-sm-8 col-form-label col-form-label-sm text-start" th:text="${info.title}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start">
<th:block th:each="commonCode:${session.commonCode.get('OG')}">
@ -40,7 +40,7 @@
</label>
<hr class="my-1">
<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 class="col-sm-11 form-control-sm">
<div id="content" th:utext="${info.content}"></div>
</div>
</div>