tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into kakaoFT

Browse Source
This commit is contained in:
rosewiper 2024-01-10 13:28:25 +09:00
commit bb5cdcc7c3
8 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/webapp/WEB-INF/jsp/layout/include/defaultResource.jsp
View File

@ -75,6 +75,8 @@
<!-- Uncaught TypeError: e.widget is not a function로 인해 가장 마지막에 선언_이준호_220510 --> <!-- Uncaught TypeError: e.widget is not a function로 인해 가장 마지막에 선언_이준호_220510 -->
<script type="text/javascript" src="/dist/js/jquery_wrapper.min.js"></script> <script type="text/javascript" src="/dist/js/jquery_wrapper.min.js"></script>
<%-- 20240110 matomo 사용 안함으로 인하여 주석처리 함
<c:if test="${fn:contains(pageContext.request.requestURL, 'munjaon.co.kr')}"> <c:if test="${fn:contains(pageContext.request.requestURL, 'munjaon.co.kr')}">
<!-- Matomo --> <!-- Matomo -->
<script> <script>
@ -96,5 +98,5 @@
</script> </script>
<noscript><p><img src="https://mtm.munjaon.co.kr:9997/matomo.php?idsite=2&amp;rec=1" style="border:0;" alt="" /></p></noscript> <noscript><p><img src="https://mtm.munjaon.co.kr:9997/matomo.php?idsite=2&amp;rec=1" style="border:0;" alt="" /></p></noscript>
<!-- End Matomo Code --> <!-- End Matomo Code -->
</c:if> </c:if> --%>

14
src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
View File

@ -870,7 +870,7 @@ function actionLogin() {
<tr class="moneyBack"> <tr class="moneyBack">
<th>은행명</th> <th>은행명</th>
<td> <td>
<label for="" class="label">은행명 선택</label> <label for="bankNm" class="label">은행명 선택</label>
<select id="bankNm" name="bankNm" onclick="pointLimitUnderAction()"> <select id="bankNm" name="bankNm" onclick="pointLimitUnderAction()">
<option value="">은행선택</option> <option value="">은행선택</option>
<option value="국민은행">국민은행</option> <option value="국민은행">국민은행</option>
@ -886,21 +886,21 @@ function actionLogin() {
<tr class="moneyBack"> <tr class="moneyBack">
<th>계좌번호</th> <th>계좌번호</th>
<td> <td>
<label for="" class="label">계좌번호 입력</label> <label for="accountNum" class="label">계좌번호 입력</label>
<input type="text" name="accountNum" id="accountNum" placeholder="계좌번호를 입력해주세요" onfocus="this.placeholder=''" onblur="this.placeholder='새 계좌번호를 입력해주세요'"class="inputLight" style="width: 100%;" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/(\..*)\./g, '$1');" maxlength="20" onclick="pointLimitUnderAction()"> <input type="text" name="accountNum" id="accountNum" placeholder="계좌번호를 입력해주세요" onfocus="this.placeholder=''" onblur="this.placeholder='새 계좌번호를 입력해주세요'"class="inputLight" style="width: 100%;" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/(\..*)\./g, '$1');" maxlength="20" onclick="pointLimitUnderAction()">
</td> </td>
</tr> </tr>
<tr class="moneyBack"> <tr class="moneyBack">
<th>예금주</th> <th>예금주</th>
<td> <td>
<label for="" class="label">예금주 입력</label> <label for="accountNm" class="label">예금주 입력</label>
<input type="text" name="accountNm" id="accountNm" placeholder="예금주를 입력해주세요" onfocus="this.placeholder=''" onblur="this.placeholder='새 예금주를 입력해주세요'"class="inputLight" style="width: 100%;" maxlength="20" onclick="pointLimitUnderAction()"> <input type="text" name="accountNm" id="accountNm" placeholder="예금주를 입력해주세요" onfocus="this.placeholder=''" onblur="this.placeholder='새 예금주를 입력해주세요'"class="inputLight" style="width: 100%;" maxlength="20" onclick="pointLimitUnderAction()">
</td> </td>
</tr> </tr>
<tr class="moneyBack"> <tr class="moneyBack">
<th>연락처</th> <th>연락처</th>
<td> <td>
<label for="" class="label">연락처 입력</label> <label for="mbtlNum" class="label">연락처 입력</label>
<input type="text" name="mbtlNum" id="mbtlNum" placeholder="‘-’없이 전화번호를 입력해주세요" onfocus="this.placeholder=''" onblur="this.placeholder='‘-’없이 전화번호를 입력해주세요'"class="inputLight" style="width: 100%;" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/(\..*)\./g, '$1');" maxlength="20" onclick="pointLimitUnderAction()"> <input type="text" name="mbtlNum" id="mbtlNum" placeholder="‘-’없이 전화번호를 입력해주세요" onfocus="this.placeholder=''" onblur="this.placeholder='‘-’없이 전화번호를 입력해주세요'"class="inputLight" style="width: 100%;" oninput="this.value = this.value.replace(/[^0-9]/g, '').replace(/(\..*)\./g, '$1');" maxlength="20" onclick="pointLimitUnderAction()">
</td> </td>
</tr> </tr>
@ -915,9 +915,9 @@ function actionLogin() {
<tr> <tr>
<th>목록 노출</th> <th>목록 노출</th>
<td> <td>
<label for="point" class="label">목록 노출여부</label> <label for="screenYnY" class="label">목록 노출여부</label>
<input type="radio" name="screenYn" value="Y" checked="checked">노출 <input type="radio" id="screenYnY" name="screenYn" value="Y" checked="checked">노출
<input type="radio" name="screenYn" value="N">비노출 <input type="radio" id="screenYnN" name="screenYn" value="N">비노출
</td> </td>
</tr> </tr>
</tbody> </tbody>

18
src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeRegist.jsp
View File

@ -114,25 +114,25 @@
<div class="input_list_item bis_status"> <div class="input_list_item bis_status">
<div class="input_left">이메일</div> <div class="input_left">이메일</div>
<div class="input_right"> <div class="input_right">
<label for="" class="label">이메일 주소 앞자리</label> <label for="emailId" class="label">이메일 주소 앞자리</label>
<input type="text" value="${fn:substringBefore(mberManageVO.mberEmailAdres, '@')}" class="list_inputType1" disabled> <input type="text" id="emailId" value="${fn:substringBefore(mberManageVO.mberEmailAdres, '@')}" class="list_inputType1" disabled>
<span>@</span> <span>@</span>
<label for="" class="label">이메일 주소 뒷자리</label> <label for="emailDomain" class="label">이메일 주소 뒷자리</label>
<input type="text" value="${fn:substringAfter(mberManageVO.mberEmailAdres, '@')}" class="list_inputType1" disabled> <input type="text" id="emailDomain" value="${fn:substringAfter(mberManageVO.mberEmailAdres, '@')}" class="list_inputType1" disabled>
</div> </div>
</div> </div>
<div class="input_list_item"> <div class="input_list_item">
<div class="input_left">휴대폰</div> <div class="input_left">휴대폰</div>
<div class="input_right"> <div class="input_right">
<label for="" class="label">휴대폰</label> <label for="moblphonNo" class="label">휴대폰</label>
<input type="text" class="list_inputType1" value="${mberManageVO.moblphonNo}" disabled> <input type="text" class="list_inputType1" id="moblphonNo" value="${mberManageVO.moblphonNo}" disabled>
</div> </div>
</div> </div>
<c:if test="${boardType ne 'suggest'}"> <c:if test="${boardType ne 'suggest'}">
<div class="input_list_item"> <div class="input_list_item">
<div class="input_left">구분</div> <div class="input_left">구분</div>
<div class="input_right"> <div class="input_right">
<label for="" class="label">구분 선택</label> <label for="bbsId" class="label">구분 선택</label>
<select class="list_selType1" name="bbsId" id="bbsId"> <select class="list_selType1" name="bbsId" id="bbsId">
<c:forEach var="result" items="${boardMenuList}" varStatus="status"> <c:forEach var="result" items="${boardMenuList}" varStatus="status">
<option value="${result.bbsId}">${result.bbsNm}</option> <option value="${result.bbsId}">${result.bbsNm}</option>
@ -147,14 +147,14 @@
<div class="input_list_item"> <div class="input_list_item">
<div class="input_left">제목</div> <div class="input_left">제목</div>
<div class="input_right"> <div class="input_right">
<label for="" class="label">문의사항 제목</label> <label for="nttSj" class="label">문의사항 제목</label>
<input type="text" name="nttSj" id="nttSj" value="" class="list_inputType1" placeholder="문의사항 제목 입력" onfocus="this.placeholder=''" onblur="this.placeholder='문의사항 제목 입력 입력'"> <input type="text" name="nttSj" id="nttSj" value="" class="list_inputType1" placeholder="문의사항 제목 입력" onfocus="this.placeholder=''" onblur="this.placeholder='문의사항 제목 입력 입력'">
</div> </div>
</div> </div>
<div class="input_list_item textWrap"> <div class="input_list_item textWrap">
<div class="input_left">내용</div> <div class="input_left">내용</div>
<div> <div>
<label for="" class="label">문의내용</label> <label for="nttCn" class="label">문의내용</label>
<form:textarea path="nttCn"/> <form:textarea path="nttCn"/>
</div> </div>
</div> </div>

20
src/main/webapp/WEB-INF/jsp/web/cop/bbs/EgovNoticeUpdt.jsp
View File

@ -106,27 +106,27 @@
<div class="input_list_item bis_status"> <div class="input_list_item bis_status">
<div class="input_left">이메일</div> <div class="input_left">이메일</div>
<div class="input_right"> <div class="input_right">
<label for="" class="label">이메일 주소 앞자리</label> <label for="emailId" class="label">이메일 주소 앞자리</label>
<input type="text" value="${fn:substringBefore(mberManageVO.mberEmailAdres, '@')}" class="list_inputType1" disabled> <input type="text" id="emailId" value="${fn:substringBefore(mberManageVO.mberEmailAdres, '@')}" class="list_inputType1" disabled>
<span>@</span> <span>@</span>
<label for="" class="label">이메일 주소 뒷자리</label> <label for="emailDomain" class="label">이메일 주소 뒷자리</label>
<input type="text" value="${fn:substringAfter(mberManageVO.mberEmailAdres, '@')}" class="list_inputType1" disabled> <input type="text" id="emailDomain" value="${fn:substringAfter(mberManageVO.mberEmailAdres, '@')}" class="list_inputType1" disabled>
</div> </div>
</div> </div>
<div class="input_list_item"> <div class="input_list_item">
<div class="input_left">휴대폰</div> <div class="input_left">휴대폰</div>
<div class="input_right"> <div class="input_right">
<label for="" class="label">휴대폰</label> <label for="moblphonNo" class="label">휴대폰</label>
<input type="text" class="list_inputType1" value="${mberManageVO.moblphonNo}" disabled> <input type="text" id="moblphonNo" class="list_inputType1" value="${mberManageVO.moblphonNo}" disabled>
</div> </div>
</div> </div>
<div class="input_list_item"> <div class="input_list_item">
<div class="input_left">구분</div> <div class="input_left">구분</div>
<div class="input_right"> <div class="input_right">
<label for="" class="label">구분 선택</label>
<c:forEach var="result" items="${boardMenuList}" varStatus="status"> <c:forEach var="result" items="${boardMenuList}" varStatus="status">
<c:if test="${result.bbsId eq brdMstrVO.bbsId}"> <c:if test="${result.bbsId eq brdMstrVO.bbsId}">
${result.bbsNm} <label for="bbsNm" class="label">구분 선택</label>
<input type="text" id="bbsNm" class="list_inputType1" value="${result.bbsNm}" disabled>
</c:if> </c:if>
</c:forEach> </c:forEach>
</div> </div>
@ -134,14 +134,14 @@
<div class="input_list_item"> <div class="input_list_item">
<div class="input_left">제목</div> <div class="input_left">제목</div>
<div class="input_right"> <div class="input_right">
<label for="" class="label">문의사항 제목</label> <label for="nttSj" class="label">문의사항 제목</label>
<input type="text" name="nttSj" id="nttSj" value="${board.nttSj}" class="list_inputType1" placeholder="문의사항 제목 입력" onfocus="this.placeholder=''" onblur="this.placeholder='문의사항 제목 입력 입력'"> <input type="text" name="nttSj" id="nttSj" value="${board.nttSj}" class="list_inputType1" placeholder="문의사항 제목 입력" onfocus="this.placeholder=''" onblur="this.placeholder='문의사항 제목 입력 입력'">
</div> </div>
</div> </div>
<div class="input_list_item textWrap"> <div class="input_list_item textWrap">
<div class="input_left">문의내용</div> <div class="input_left">문의내용</div>
<div> <div>
<label for="" class="label">문의내용</label> <label for="nttCn" class="label">문의내용</label>
<form:textarea path="nttCn"/> <form:textarea path="nttCn"/>
</div> </div>
</div> </div>

2
src/main/webapp/WEB-INF/jsp/web/cop/bbs/FaqList.jsp
View File

@ -123,7 +123,7 @@ function linkPage(pageNo){
<div> <div>
<div class="search_wrap clearfix"> <div class="search_wrap clearfix">
<div class="btn_left"> <div class="btn_left">
<label for="" class="label">검색조건 선택</label> <label for="searchSel" class="label">검색조건 선택</label>
<select name="searchCnd" id="searchSel" class="selType2"> <select name="searchCnd" id="searchSel" class="selType2">
<option value="" <c:if test="${searchVO.searchCnd == ''}">selected="selected"</c:if>>전체</option> <option value="" <c:if test="${searchVO.searchCnd == ''}">selected="selected"</c:if>>전체</option>
<option value="0" <c:if test="${searchVO.searchCnd == '0'}">selected="selected"</c:if>>제목</option> <option value="0" <c:if test="${searchVO.searchCnd == '0'}">selected="selected"</c:if>>제목</option>

2
src/main/webapp/WEB-INF/jsp/web/cop/bbs/QnaList.jsp
View File

@ -161,7 +161,7 @@ function linkPage(pageNo){
<button type="button" class="btnType btnType2" onclick="javascript:linkPage('1'); return false;"><img src="/publish/images/content/searchW.png" alt="검색"></button> <button type="button" class="btnType btnType2" onclick="javascript:linkPage('1'); return false;"><img src="/publish/images/content/searchW.png" alt="검색"></button>
</div> </div>
<div class="btn_right2"> <div class="btn_right2">
<label for="searchCnd" class="label">검색조건 선택</label> <label for="searchSel" class="label">검색조건 선택</label>
<select name="searchCnd" id="searchSel" class="selType2"> <select name="searchCnd" id="searchSel" class="selType2">
<option value="" <c:if test="${searchVO.searchCnd == ''}">selected="selected"</c:if>>전체</option> <option value="" <c:if test="${searchVO.searchCnd == ''}">selected="selected"</c:if>>전체</option>
<option value="0" <c:if test="${searchVO.searchCnd == '0'}">selected="selected"</c:if>>제목</option> <option value="0" <c:if test="${searchVO.searchCnd == '0'}">selected="selected"</c:if>>제목</option>

2
src/main/webapp/WEB-INF/jsp/web/cop/bbs/SuggestList.jsp
View File

@ -161,7 +161,7 @@ function linkPage(pageNo){
<button type="button" class="btnType btnType2" onclick="javascript:linkPage('1'); return false;"><img src="/publish/images/content/searchW.png" alt="검색"></button> <button type="button" class="btnType btnType2" onclick="javascript:linkPage('1'); return false;"><img src="/publish/images/content/searchW.png" alt="검색"></button>
</div> </div>
<div class="btn_right2"> <div class="btn_right2">
<label for="searchCnd" class="label">검색조건 선택</label> <label for="searchSel" class="label">검색조건 선택</label>
<select name="searchCnd" id="searchSel" class="selType2"> <select name="searchCnd" id="searchSel" class="selType2">
<option value="" <c:if test="${searchVO.searchCnd == ''}">selected="selected"</c:if>>전체</option> <option value="" <c:if test="${searchVO.searchCnd == ''}">selected="selected"</c:if>>전체</option>
<option value="0" <c:if test="${searchVO.searchCnd == '0'}">selected="selected"</c:if>>제목</option> <option value="0" <c:if test="${searchVO.searchCnd == '0'}">selected="selected"</c:if>>제목</option>

12
src/main/webapp/publish/css/content.css
View File

@ -1051,7 +1051,7 @@ button.check_validity:hover {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px
.hisroy_price .hisroy_price_in>div>p:last-child {float: right;} .hisroy_price .hisroy_price_in>div>p:last-child {float: right;}
.hisroy_price .hisroy_price_in>div>p>span {font-size: 22px; font-family: 'GmarketSansBold'; color: #002c9a; padding-right: 5px;} .hisroy_price .hisroy_price_in>div>p>span {font-size: 22px; font-family: 'GmarketSansBold'; color: #002c9a; padding-right: 5px;}
/*후불회원 요금 사용내역*/ /*후불회원 요금 사용내역*/
.hisroy_price .hisroy_defprice_in {position:relative; background-color: #f2f2f2; width: calc(100%/4 - 20px); padding: 28px 22px 40px 22px; border-radius: 5px; box-sizing: border-box;} .hisroy_price .hisroy_defprice_in {position:relative; background-color: #f2f2f2; width: calc(100%/4 - 10px); padding: 28px 22px 40px 22px; border-radius: 5px; box-sizing: border-box;}
.hisroy_price .hisroy_defprice_in>p {font-size: 20px; font-weight: 600; margin-bottom: 25px; font-family: 'GmarketSansBold';} .hisroy_price .hisroy_defprice_in>p {font-size: 20px; font-weight: 600; margin-bottom: 25px; font-family: 'GmarketSansBold';}
.hisroy_price .hisroy_defprice_in i{background-size: 100%;} .hisroy_price .hisroy_defprice_in i{background-size: 100%;}
.hisroy_price .hisroy_defprice_in:nth-child(1) i {background-image: url(/publish/images/content/history_icon1.png); width: 23px; height: 26px; margin: 0 10px 2px 0;} .hisroy_price .hisroy_defprice_in:nth-child(1) i {background-image: url(/publish/images/content/history_icon1.png); width: 23px; height: 26px; margin: 0 10px 2px 0;}
@ -1060,13 +1060,13 @@ button.check_validity:hover {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px
.hisroy_price .hisroy_defprice_in:nth-child(4) i {background-image: url(/publish/images/content/history_icon3.png); width: 21px; height: 21px; margin: 0 10px 2px 0;} .hisroy_price .hisroy_defprice_in:nth-child(4) i {background-image: url(/publish/images/content/history_icon3.png); width: 21px; height: 21px; margin: 0 10px 2px 0;}
.hisroy_price .hisroy_defprice_in>div {background-color: #fff; height: 50px; padding: 0 20px; border-radius: 5px; line-height: 50px; box-sizing: border-box;} .hisroy_price .hisroy_defprice_in>div {background-color: #fff; height: 50px; padding: 0 20px; border-radius: 5px; line-height: 50px; box-sizing: border-box;}
.hisroy_price .hisroy_defprice_in>div:last-child {margin-top: 10px;} .hisroy_price .hisroy_defprice_in>div:last-child {margin-top: 10px;}
.hisroy_price .hisroy_defprice_in>div>p {font-size: 17px; font-weight: 300;} .hisroy_price .hisroy_defprice_in>div>p {font-size: 15px; font-weight: 300;}
.hisroy_price .hisroy_defprice_in>div>p:first-child {float: left;} .hisroy_price .hisroy_defprice_in>div>p:first-child {float: left;}
.hisroy_price .hisroy_defprice_in>div>p:last-child {float: right;} .hisroy_price .hisroy_defprice_in>div>p:last-child {float: right;}
.hisroy_price .hisroy_defprice_in>div>p>span {font-size: 22px; font-family: 'GmarketSansBold'; color: #002c9a; padding-right: 5px;} .hisroy_price .hisroy_defprice_in>div>p>span {font-size: 20px; font-family: 'GmarketSansBold'; color: #002c9a; padding-right: 1px;}
.hisroy_price .hisroy_defprice_in .clearfix{ display: flex; justify-content: space-between; align-items: center; height: 40px; background-color: #fff; padding: 5px 15px; border-radius: 5px; margin: 0 0 10px 0;} .hisroy_price .hisroy_defprice_in .clearfix{ display: flex; justify-content: space-between; align-items: center; height: 40px; background-color: #fff; padding: 5px 10px; border-radius: 5px; margin: 0 0 10px 0;}
.hisroy_price .hisroy_defprice_in .clearfix:last-child{margin: 0 0 0 0; text-align: right;} .hisroy_price .hisroy_defprice_in .clearfix:last-child{margin: 0 0 0 0; text-align: right;}
.hisroy_price .hisroy_defprice_in .clearfix p:nth-child(2n){width: calc(100% - 50px); text-align: right;} .hisroy_price .hisroy_defprice_in .clearfix p:nth-child(2n){width: calc(100% - 5px); text-align: right;}
.hisroy_price .hisroy_defprice_in dl {position: absolute; font-size:13px; color:#777; padding:0; top:178px;} .hisroy_price .hisroy_defprice_in dl {position: absolute; font-size:13px; color:#777; padding:0; top:178px;}
.hisroy_price .hisroy_defprice_in dl dd {padding:2px 0 0 8px;} .hisroy_price .hisroy_defprice_in dl dd {padding:2px 0 0 8px;}
@ -2084,7 +2084,7 @@ button.check_validity:hover {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px
/* 후불회원 요금사용내역*/ /* 후불회원 요금사용내역*/
.hisroy_price .hisroy_defprice_in>p {font-size: 18px; font-weight: 600; margin-bottom: 25px; font-family: 'GmarketSansBold';} .hisroy_price .hisroy_defprice_in>p {font-size: 18px; font-weight: 600; margin-bottom: 25px; font-family: 'GmarketSansBold';}
.hisroy_price .hisroy_defprice_in>div>p>span {font-size: 18px; font-family: 'GmarketSansBold'; color: #002c9a; padding-right: 5px;} .hisroy_price .hisroy_defprice_in>div>p>span {font-size: 17px; font-family: 'GmarketSansBold'; color: #002c9a; padding-right: 1px;}
} }
@media only screen and (max-width:1480px){ @media only screen and (max-width:1480px){