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

소스충돌 처리

Browse Source
This commit is contained in:
com02 2021-11-19 14:37:54 +09:00
parent 51a657fe83
commit 4fa9982dff
3 changed files with 2983 additions and 2997 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,7 @@ function goList(){
</div>
</div>
<div class="tit"><c:out value="${result.title}"/></div>
<div class="img"><img src="<c:out value="${result.rprsThumbUrlWithDefault}"/>" alt="썸네일"></div>
<div class="img"><img src="<c:out value="${result.rprsThumbUrlWithDefaultBig}"/>" alt="썸네일"></div>
</div>
<div class="right">
<div class="con-1">
@ -343,7 +343,7 @@ function goList(){
<div class="List" onclick="gfn_getDetail('${result.masterId}','${result.domainHostNm }');">
<div class="inner">
<div class="thumbnail">
<span class="image-frame"><img src="${result.rprsThumbUrlWithDefault }" alt=""/></span>
<span class="image-frame"><img src="${result.rprsThumbUrlWithDefaultMiddle }" alt=""/></span>
<div class="detail-cover">
<strong>${result.title }</strong>
<ul>

26
src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
View File

@ -35,13 +35,6 @@
<c:set var="pageTitle">소장 자료</c:set>
<!DOCTYPE html>
<html>
<head>
<style>
</style>
<title>${pageTitle}</title>
<!-- GRID -->
<link type="text/css" rel="stylesheet" href="${pageContext.request.contextPath}/js/jsgrid/nlib-jsgrid.css" />
<link type="text/css" rel="stylesheet" href="${pageContext.request.contextPath}/js/jsgrid/nlib-jsgrid-theme.css" />
@ -216,9 +209,7 @@ function fn_search_article(pageIndex) {
}
</script>
</head>
<body>
<!-- 소장자료 섹션 -->
<form name="referencelistForm" id="referencelistForm" method="get" action="/search/searchList.do">
<input type="hidden" name="collection" id="collection" value="<c:out value='${searchVO.collection}'/>" />
@ -273,7 +264,6 @@ function fn_search_article(pageIndex) {
</div>
<div class="filter-list">
<ul id="ul_category1List">
<li>
<c:forEach var="firstClassList" items="${firstClassList}" varStatus="fcStatus">
<li>
<div class="depth-1 <c:if test="${fn:contains(searchVO.filter_class, firstClassList.column1) }"> on</c:if>">
@ -295,7 +285,6 @@ function fn_search_article(pageIndex) {
</ul>
</li>
</c:forEach>
</li>
</ul>
</div>
<button type="button" class="btn-toggle-more">더보기</button>
@ -340,12 +329,11 @@ function fn_search_article(pageIndex) {
<label for="m-year-1"><input type="radio" id="m-year-1" name="m-year" value="all">전체</label>
</li>
<li>
<label for="m-year-2-1"><input type="radio" id="m-year-2" name="m-year" value="date">
<input type="text" id="creatYyyyStart" name="creatYyyyStart" onKeyup="this.value=this.value.replace(/[^0-9]/g,'');" maxlength='4' placeholder="예) 2017"> ~ <input type="text" id="creatYyyyEnd" name="creatYyyyEnd" onKeyup="this.value=this.value.replace(/[^0-9]/g,'');" maxlength='4' placeholder="예) 2018">
</label>
<label for="m-year-2">생산년도 검색</label><input type="radio" id="m-year-2" name="m-year" value="date">
<label for="creatYyyyStart" style="display:none">생산년도 시작</label><input type="text" id="creatYyyyStart" name="creatYyyyStart" onKeyup="this.value=this.value.replace(/[^0-9]/g,'');" maxlength='4' placeholder="예) 2017"> ~ <label for="creatYyyyEnd" style="display:none">생산년도 끝</label><input type="text" id="creatYyyyEnd" name="creatYyyyEnd" onKeyup="this.value=this.value.replace(/[^0-9]/g,'');" maxlength='4' placeholder="예) 2018">
</li>
<li>
<label for="createYyyyYn"><input type="checkbox" id="creatYyyyYn" name="creatYyyyYn" value="Y">미상포함</label>
<label for="creatYyyyYn"><input type="checkbox" id="creatYyyyYn" name="creatYyyyYn" value="Y">미상포함</label>
</li>
</ul>
</div>
@ -441,8 +429,7 @@ function fn_search_article(pageIndex) {
<c:forEach var="result" items="${searchVO.resultList}"> <!-- 리스트 출력 시작 -->
<div class="list">
<div class="t-data">
<div class="img"><a href="javascript:void(0)"><img src="${result.rprsThumbUrlWithDefault }" alt="썸네일" width="60" height="91" title="상세보기" onclick="goDetail('${result.masterId}');"></a>
<sec:authorize access="isAuthenticated()">
<div class="img"><a href="javascript:void(0)"><img src="${result.rprsThumbUrlWithDefaultSmall }" alt="썸네일" width="60" height="91" title="상세보기" onclick="goDetail('${result.masterId}');"></a>
<c:if test='${result.MUseYn == "Y"}'>
<span id="favorites_${result.masterId}" class="favorites" onclick="fn_changeInterest('${result.masterId }', 'off')" title="관심자료에서 삭제합니다.">
<img src="/images/icon/icon-cart-Favorites-on.png" class="off" alt="즐겨찾기 아이콘">
@ -455,7 +442,6 @@ function fn_search_article(pageIndex) {
<img src="/images/icon/icon-cart-Favorites-on.png" class="on" alt="즐겨찾기 아이콘">
</span>
</c:if>
</sec:authorize>
</div>
<div class="type">
<c:if test="${!empty result.openDivCd && result.openDivCd ne '3' && result.operReadRangeCd eq '01' && result.digitalReadYn eq 'Y'}">
@ -494,7 +480,7 @@ function fn_search_article(pageIndex) {
<c:if test="${(!empty result.openDivCd) && (result.openDivCd ne '3') && (!empty result.interfaceId) && result.digitalReadYn eq 'Y'}">
<button type="button" class="btn-color" onclick="gfn_showDocPdf('${result.interfaceId}','${result.masterId}','${result.typeDivCd}','${result.dtlsTypeDivCd}')";>원문보기</button>
</c:if>
<button type="button" class="btn-gray" onclick="risShow('${result.masterId}')";>RIS</button>
<button type="button" class="btn-gray" onclick="risShow('${result.masterId}');">RIS</button>
</div>
</div>
</c:forEach> <!-- 리스트 출력 끝부분 -->
@ -525,5 +511,3 @@ function fn_search_article(pageIndex) {
</div>
</div>
</form>
</body>
</html>

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

@ -730,14 +730,14 @@ transform: rotate(45deg);}
.filter-head h2 {float: left;font-size: 18px;font-weight: 600;}
.filter-head .btn-filter-reset {float: right;background: url(/images/icon/icon-data-reset.png) no-repeat right center;padding: 4px 22px 4px 0px;font-size:14px;font-weight: 400;color:#666;}
.filter-wrap .choice-condition {display:inline-block;padding-top: 14px;color: #707070;}
.filter-wrap .choice-condition ul li {font-size:12px;background:#f4f4f4;float:left;padding:2px 30px 3px 10px;border-radius: 50px;margin:0px 5px 5px 0px;border:1px solid #ddd;background:url(/images/icon/icon-data-close.png) no-repeat #f4f4f4;background-position: 92% center;cursor: pointer;}
.filter-wrap .choice-condition ul li {font-size:12px;background:#f4f4f4;float:left;padding:2px 10px 3px 10px;border-radius: 50px;margin:0px 5px 5px 0px;border:1px solid #ddd;background:url(/images/icon/icon-data-close.png) no-repeat #f4f4f4;background-position: 92% center;cursor: pointer;}
.filter-wrap .choice-condition .sign {margin: 0 10px;}
.filter-wrap .choice-condition em {color: #333;}
.filter-wrap .choice-condition .btn-del-filter {margin-left: 10px;text-indent: -9999px;overflow: hidden;width: 13px;height: 13px;vertical-align: sub;background: url(/images/btn/btn-cnl.jpg) no-repeat right center;}
.filter-wrap .filter {margin-top: 32px;}
.filter-wrap .filter-tit {clear: both;border-bottom: 1px solid #ccc;padding-bottom: 6px;_margin-bottom: 16px;}
.filter-wrap .filter-tit h3 {color: #000;font-size: 16px;float: left;}
.filter-wrap .filter-tit .btn-toggle {float: right;background: url(/images/btn/btn-minus.jpg) no-repeat center right;text-indent: -9999px;}
.filter-wrap .filter-tit .btn-toggle {float: right;text-indent: -9999px;}
.filter-wrap .filter-tit .btn-toggle.on {background: url(/images/btn/btn-plus.png) no-repeat center right;}
.filter-wrap .filter-tit:after {content: "";display: block;clear: both;}
.filter-wrap .filter .depth-1 {margin-top: 11px;padding-left: 10px;}
@ -850,7 +850,7 @@ transform: rotate(45deg);}
.data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input {height:36px;line-height: 36px;border:1px solid #ddd;color:#666;padding:0px 40px 0px 10px;vertical-align: top;border-radius: 3px;position: relative;}
.data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input input::placeholder {font-size:12px;color:#999;font-weight: 500;}
.data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input button {background: url(/images/icon/icon-data-search.png) no-repeat center;text-indent: -9999999px;width:36px;height:36px;vertical-align: top;position: absolute;top:0px;right:0px;}
.data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input button.filter-btn {display:none;}
/********** 소장자료 상세페이지 **********/
.data.detail {width:100%;}
@ -868,13 +868,14 @@ transform: rotate(45deg);}
.data.detail .inner .row-top .center .left .cla .con-2 {display: inline-block;padding:0px 0px 0px 10px;}
.data.detail .inner .row-top .center .left .cla .con-2 .code {font-size:16px;color:#fff;line-height: 26px;}
.data.detail .inner .row-top .center .left .tit {font-size:30px;color:#fff;font-weight: 500;margin-bottom:20px;}
.data.detail .inner .row-top .center .left .img {background:#fff;display: inline-block;}
.data.detail .inner .row-top .center .left .img {background:#fff;display: inline-block;width:100%;height:445px;display: flex;align-items: center;justify-content: center;}
.data.detail .inner .row-top .center .right .con-1 {display: inline-block;width:100%;height:100px;border-bottom:1px solid #ddd;text-align: right;margin-bottom: 30px;}
.data.detail .inner .row-top .center .right .con-1 button {background:#f5f5f5;width:auto;height:30px;line-height:28px;width:30px;border-radius: 3px;font-size:14px;color:#222;font-weight: 600;text-align: center;border:1px solid #ddd;margin-top:55px;}
.data.detail .inner .row-top .center .right .con-1 button.view {width:auto;padding:0px 26px;}
.data.detail .inner .row-top .center .right .con-1 button.ris {}
.data.detail .inner .row-top .center .right .con-1 button.favorit {text-indent: -99999px;background:url(/images/icon/icon-data-star.png) no-repeat center #f5f5f5;}
.data.detail .inner .row-top .center .right .con-1 button.share {text-indent: -99999px;background:url(/images/icon/icon-data-share.png) no-repeat center #f5f5f5;}
.data.detail .inner .row-top .center .right .con-1 button.original {width:200px;display:none;}
.data.detail .inner .row-top .center .right .con-2 {}
.data.detail .inner .row-top .center .right .con-2 .de-data {display: flex;}
.data.detail .inner .row-top .center .right .con-2 .de-data ul {width: 50%;display: flex;flex-direction: column;}
@ -899,7 +900,8 @@ transform: rotate(45deg);}
.data.detail .inner .row-bottom .con-1 .text-box {display:inline-block;width:96%;padding:10px 2%;background:#f4f4f4;text-align: left;}
.data.detail .inner .row-bottom .con-1 .text-box p {font-size:12px;}
.data.detail .inner .row-bottom .con-2 {display:inline-block;width:100%;border-top:1px solid #333;border-bottom:1px solid #ddd;margin:0px 0px 100px;}
.data.detail .inner .row-bottom .con-2 .top h3 {font-size:24px;text-align: center;}
.data.detail .inner .row-bottom .con-2 .top {position:relative;}
.data.detail .inner .row-bottom .con-2 .top h3 {font-size:24px;text-align: center;height:60px;line-height:60px;}
.data.detail .inner .row-bottom .con-2 .top h3 span {color: #376795;}
.data.detail .inner .row-bottom .con-2 .top .down-btn {position: absolute;top:0px;right:0px;text-indent: -999999px;background:url(/images/icon/icon-data-downarr2.png) no-repeat center;width:60px;height:60px;}
.data.detail .inner .row-bottom .con-2 .top .down-btn.on {background:url(/images/icon/icon-data-downarr2-on.png) no-repeat center;}
@ -1314,7 +1316,7 @@ transform: rotate(45deg);}
.list-table-wrap li .t-status {width: 10%;}
.list-table-wrap li .t-file {width:auto;}
.list-table-wrap li .t-answer {width:auto;}
.list-table-wrap .t-tit-line {width: 100%;border-top: 2px solid #000;border-bottom: 1px solid #000;color: #fff;font-size:12px;font-weight:400;background: #556676;}
.list-table-wrap .t-tit-line {width: 100%;border-top: 2px solid #000;border-bottom: 1px solid #000;color: #fff;font-size:14px;font-weight:400;background: #556676;}
.list-table-wrap .t-tit-line span {text-align: center;}
.list-table-wrap li .message {width: 100%;text-align: center;}
.list-table-wrap .t-status em {text-align: center;font-size: 14px;width: 82px;height: 30px;line-height: 30px;display: block;margin: 0 auto;border-radius: 15px;border: 1px solid #ddd;}
@ -1992,7 +1994,7 @@ animation: animate-bg2 2.0s 1.9s ease-in infinite;
.paging .btn-next {text-indent: 0px;width:70px;text-align:left;}
.paging .btn a {font-size:12px;font-weight: 300;}
.article-side .filter-wrap .Title {display:none;}