somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
JSYOO 2021-12-09 17:58:26 +09:00
commit 5f94c10eff
8 changed files with 23 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/nlib/col/web/ReadController.java
View File

@ -82,16 +82,6 @@ public class ReadController extends NlibCommonController {
return retJsp;
}
if(!isValidCsrfToken(request, csrfToken)) {
if(fromCart && StringUtil.getString(fromPage, "").equalsIgnoreCase("login")) {
// 비로그인자의 카트에서 신청을 실행하여 로그인 후 신청 진입으로 돌아온 경우
return "redirect:/cart/listCartItems.do?cartTypeCd=2";
} else {
model.addAttribute("message", "잘못된 접근입니다.");
return retJsp;
}
}
if(readVO == null || StringUtil.isEmpty(readVO.getSelItems())) {
if(fromCart && StringUtil.getString(fromPage, "").equalsIgnoreCase("login")) {
// 비로그인자의 카트에서 신청을 실행하여 로그인 후 신청 진입으로 돌아온 경우

10
src/main/java/nlib/col/web/RentController.java
View File

@ -238,16 +238,6 @@ public class RentController extends NlibCommonController
return "nlib/rent/confirmRent";
}
if(!isValidCsrfToken(request, csrfToken)) {
if(fromCart && StringUtil.getString(fromPage, "").equalsIgnoreCase("login")) {
// 비로그인자의 카트에서 신청을 실행하여 로그인 후 신청 진입으로 돌아온 경우
return "redirect:/cart/listCartItems.do";
} else {
model.addAttribute("message", "잘못된 접근입니다.");
return "nlib/rent/confirmRent";
}
}
if(rentVO == null || StringUtil.isEmpty(rentVO.getSelItems())) {
if(fromCart && StringUtil.getString(fromPage, "").equalsIgnoreCase("login")) {
// 비로그인자의 카트에서 신청을 실행하여 로그인 후 신청 진입으로 돌아온 경우

6
src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp
View File

@ -322,10 +322,10 @@ function goList(){
</ul>
</div>
<div class="b-btn">
<c:if test="${result.ableRentAppNow }"><button type="button" class="btn btn-color" title="새 창 열림" onclick="gfn_rentItem('${result.mngOrgCd}', '${result.masterId}', '${csrfToken }')">대출신청</button></c:if>
<c:if test="${not result.ableRentAppNow and result.ableRentResNow }"><button type="button" class="btn btn-color" title="새 창 열림" onclick="gfn_rentItem('${result.mngOrgCd}', '${result.masterId}', '${csrfToken }')">대출예약</button></c:if>
<c:if test="${result.ableRentAppNow }"><button type="button" class="btn btn-color" title="새 창 열림" onclick="gfn_rentItem('${result.mngOrgCd}', '${result.masterId}')">대출신청</button></c:if>
<c:if test="${not result.ableRentAppNow and result.ableRentResNow }"><button type="button" class="btn btn-color" title="새 창 열림" onclick="gfn_rentItem('${result.mngOrgCd}', '${result.masterId}')">대출예약</button></c:if>
<c:if test="${result.ableReadNow }"><button type="button" class="btn btn-green" title="새 창 열림" onclick="gfn_reserveReadItem('${result.mngOrgCd}', '${result.masterId}', '${csrfToken }')">방문열람신청</button></c:if>
<c:if test="${result.ableReadNow }"><button type="button" class="btn btn-green" title="새 창 열림" onclick="gfn_reserveReadItem('${result.mngOrgCd}', '${result.masterId}')">방문열람신청</button></c:if>
<c:if test="${result.ableRent or result.ableRead }">
<button type="button" class="btn btn-orange" onclick="gfn_addRentCart('${result.masterId}', '${result.ableRent}', '${result.ableRead}')">카트담기</button>

8
src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp
View File

@ -110,10 +110,6 @@ function fn_insertRentItems() {
}
function fn_gotoDetail(masterId) {
alert("상세보기 준비중 : " + masterId);
}
function fn_searchHome() {
location.href = "/search/searchList.do";
}
@ -191,7 +187,7 @@ $(document).ready(function() {
<!-- 행 : 시작 -->
<div class="list list-content">
<div class="t-data">
<div class="img"><a href="javascript:void(0)"><img src="${rent.rprsThumbUrlWithDefaultSmall }" alt="썸네일" width="60" height="91" title="상세보기" onclick="fn_gotoDetail('${rent.masterId }')"></a>
<div class="img"><a href="javascript:void(0)"><img src="${rent.rprsThumbUrlWithDefaultSmall }" alt="썸네일" width="60" height="91" title="상세보기" onclick="gfn_getDetail('${rent.masterId }')"></a>
<c:if test='${rent.MUseYn == "Y"}'>
<span id="favorites_${rent.masterId}" class="favorites" onclick="gfn_changeInterest('${rent.masterId }', 'off')" title="관심자료에서 삭제합니다.">
<img src="/images/icon/icon-cart-Favorites-on.png" class="off" alt="즐겨찾기 아이콘">
@ -217,7 +213,7 @@ $(document).ready(function() {
<span class="visit">방문열람</span>
</c:if>
</div>
<div class="title"><a href="javascript:void(0)" onclick="fn_gotoDetail('${rent.masterId }')" title="상세보기">${rent.title }</a></div>
<div class="title"><a href="javascript:void(0)" onclick="gfn_getDetail('${rent.masterId }')" title="상세보기">${rent.title }</a></div>
</div>
<div class="t-state"><p>${rent.useStatusNm }</p></div>
<div class="t-date">${rent.rtnExpctDd }</div>

19
src/main/webapp/css/default.css
View File

@ -179,6 +179,7 @@ section .inner p.desc {font-size: 18px;color:#666;margin-bottom:40px;}
.MainSwiper .swiper-slide {height:600px}
.MainSwiper .swiper-slide .img {height:600px;}
.MainSwiper .swiper-slide .img img {object-fit:cover;width:100%;height:100%;}
.MainSwiper .swiper-slide .text {}
.sec1 .inner .color-box {width:960px;margin:0 auto;text-align: center;position: relative;top:-108px;z-index:9;}
.sec1 .inner .color-box .list {float:left;width:25%;height: 216px;background:#333;position: relative;overflow: hidden;}
@ -1701,7 +1702,7 @@ transform: rotate(45deg);
/* 서지정보 팝업 */
.pop-serge {position:fixed;top:5%;left:calc(50% - 435px);width: 870px;height: 90%;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;}
.pop-serge {position:fixed;top:5%;left:calc(50% - 435px);width: 870px;height: auto;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;}
.pop-serge .inner {display:inline-block;width:90%;height:calc(100% - 50px);overflow:auto;padding:5%;background: #f2f4f7;}
.pop-serge .inner .row {padding:0px 0px 0px;text-align:center;text-align: left;}
.pop-serge .Title {text-align:center;padding:30px 0px;background: url(/images/bg/bg-login.jpg) no-repeat;background-size:cover;}
@ -1722,7 +1723,7 @@ transform: rotate(45deg);
/* 로그인 팝업 */
.pop-login {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: 60%;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;}
.pop-login {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: auto;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;}
.pop-login .inner {background:#fff;display:inilne-block;width:100%;height: calc(100% - 270px);overflow:auto;padding:60px 0px;}
.pop-login .inner .row {padding:45px 60px 0px;text-align:center;}
.pop-login .Title {background: url(/images/bg/bg-login.jpg) no-repeat;background-size:cover;text-align:center;padding:45px 0px;}
@ -1748,7 +1749,7 @@ transform: rotate(45deg);
/* 로그인 연결 팝업 */
.pop-login-connect {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: 60%;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;}
.pop-login-connect {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: auto;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;}
.pop-login-connect .inner {background:#fff;display:inilne-block;width:100%;height: calc(100% - 270px);overflow:auto;padding:50px 0px;}
.pop-login-connect .inner .row {padding:0px 60px 0px;text-align:center;}
.pop-login-connect .Title {background: url(/images/bg/bg-login.jpg) no-repeat;background-size:cover;text-align:center;padding:30px 0px;}
@ -1771,7 +1772,7 @@ transform: rotate(45deg);
/* 로그인 패스워드 팝업 */
.pop-login-password {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: 65%;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;}
.pop-login-password {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: auto;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;}
.pop-login-password .inner {background:#fff;display:inilne-block;width:100%;height: calc(100% - 218px);overflow:auto;padding:50px 0px;}
.pop-login-password .inner .row {padding:0px 60px 0px;text-align:center;}
.pop-login-password .Title {background: url(/images/bg/bg-login.jpg) no-repeat;background-size:cover;text-align:center;padding:30px 0px;}
@ -1796,7 +1797,7 @@ transform: rotate(45deg);
/* 알림 팝업 */
.pop-notice {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: 60%;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;}
.pop-notice {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: auto;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;}
.pop-notice .inner {display:inline-block;width:100%;height: calc(100% - 220px);overflow:auto;padding:50px 0px;background: #fff;}
.pop-notice .inner .row {padding:0px 60px 0px;text-align:center;}
.pop-notice .Title {text-align:center;padding:30px 0px;background: url(/images/bg/bg-login.jpg) no-repeat;background-size:cover;}
@ -1812,7 +1813,7 @@ transform: rotate(45deg);
/* 반려사유 팝업 */
.pop-return {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: 55%;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;}
.pop-return {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: auto;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;}
.pop-return .inner {display:inline-block;width:100%;height: calc(100% - 270px);overflow:auto;padding:50px 0px;background: #fff;}
.pop-return .inner .row {padding:0px 30px 0px;text-align:center;}
.pop-return .Title {text-align:center;padding:30px 0px;background: url(/images/bg/bg-login.jpg) no-repeat;background-size:cover;}
@ -1827,7 +1828,7 @@ transform: rotate(45deg);
/* 패스워드 변경 팝업 */
.pop-change {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: 60%;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;}
.pop-change {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: auto;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;}
.pop-change .inner {display:inline-block;width:100%;height: calc(100% - 270px);overflow:auto;padding:50px 0px;background: #fff;}
.pop-change .inner .row {padding:0px 60px 0px;text-align:center;}
.pop-change .Title {text-align:center;padding:30px 0px;background: url(/images/bg/bg-login.jpg) no-repeat;background-size:cover;}
@ -1849,7 +1850,7 @@ transform: rotate(45deg);
/* 패스워드 찾기 팝업 */
.pop-find {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: 60%;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;}
.pop-find {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: auto;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;}
.pop-find .inner {display:inline-block;width:100%;height: calc(100% - 270px);overflow:auto;padding:50px 0px;background: #fff;}
.pop-find .inner .row {padding:0px 60px 0px;text-align:center;}
.pop-find .Title {text-align:center;padding:30px 0px;background: url(/images/bg/bg-login.jpg) no-repeat;background-size:cover;}
@ -1870,7 +1871,7 @@ transform: rotate(45deg);
/* 회원 팝업 */
.pop-member {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: 70%;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;}
.pop-member {position:fixed;top:9%;left:calc(50% - 210px);width: 420px;height: auto;border-radius: 5px;overflow: hidden;padding: 0 0px;background: #fff;z-index:999;}
.pop-member .inner {display:inline-block;width:100%;height: calc(100% - 50px);overflow:auto;padding:40px 0px 20px;background: url(/images/bg/bg-member-pop.jpg) no-repeat;background-size:cover;}
.pop-member .inner .row {margin:0px 50px 0px;}
.pop-member .Title {text-align:center;padding:0px 0px 30px;text-align: center;}

2
src/main/webapp/css/media.css
View File

@ -1323,6 +1323,8 @@ footer .family_site {right:10px;}
footer .family_site .site_depth { width: 89%;margin:0% 5.5%; left: 0; top:auto;bottom: 40px; }
footer .family_site .site_name:after {background: url(/images/icon/icon-up-arr.png) no-repeat right top;}
footer .family_site.on .site_name:after {background: url(/images/icon/icon-down-arr.png) no-repeat right top;}
.wrap .nav-wrap #primary-nav {display:none !important;opacity:0 !important;}
}
@media all and (max-width: 350px) {

2
src/main/webapp/js/default.js
View File

@ -438,7 +438,7 @@ $(document).ready(function(){
$("#primary-nav-button").on("click", function () {
$(".mo-nav-wrap").toggleClass("show");
$(".wrap .nav-wrap .inner").toggleClass("mo_show");
$(".wrap .nav-wrap .inner .left").fadeToggle();
$(".wrap .nav-wrap .inner .left").fadeToggle(0);
$("#mo_search_icon").fadeToggle(0);
});

18
src/main/webapp/js/nlib.js
View File

@ -520,37 +520,27 @@ function gfn_getDetail(masterId, host) {
return;
}
function gfn_rentItem(mngOrgCd, masterId, token) {
function gfn_rentItem(mngOrgCd, masterId) {
if(gfn_isEmpty(masterId)) {
alert("자료ID 정보가 없습니다.");
return;
}
if(gfn_isEmpty(token)) {
alert("잘못된 접근입니다.");
return;
}
var url = "/rent/confirmRent.do?mngOrgCd=" + mngOrgCd + "&selItems=" + masterId + "&csrfToken=" + token;
var url = "/rent/confirmRent.do?mngOrgCd=" + mngOrgCd + "&selItems=" + masterId;
gfn_openNewWindow(url);
return;
}
function gfn_reserveReadItem(mngOrgCd, masterId, token) {
function gfn_reserveReadItem(mngOrgCd, masterId) {
if(gfn_isEmpty(masterId)) {
alert("자료ID 정보가 없습니다.");
return;
}
if(gfn_isEmpty(token)) {
alert("잘못된 접근입니다.");
return;
}
var url = "/read/confirmRead.do?mngOrgCd=" + mngOrgCd + "&selItems=" + masterId + "&csrfToken=" + token;
var url = "/read/confirmRead.do?mngOrgCd=" + mngOrgCd + "&selItems=" + masterId;
gfn_openNewWindow(url);
return;