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 
Conflicts:
	src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp
This commit is contained in:
KNKIM 2021-12-14 18:09:07 +09:00
commit 6f87294da7
26 changed files with 334 additions and 212 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/nlib/bbs/service/AttachFileService.java
View File

@ -32,6 +32,15 @@ import nlib.user.service.NlibLoginVO;
public interface AttachFileService public interface AttachFileService
{ {
/**
* 첨부파일 개수를 조회한다.
*
* @param attachFileId
* @return
* @throws Exception
*/
public int countAttachFiles(String attachFileId) throws Exception;
/** /**
* 첨부파일 목록을 조회한다. * 첨부파일 목록을 조회한다.
* *

10
src/main/java/nlib/bbs/service/impl/AttachFileDAO.java
View File

@ -40,6 +40,16 @@ import nlib.util.StringUtil;
@Mapper("attachFileDAO") @Mapper("attachFileDAO")
public interface AttachFileDAO { public interface AttachFileDAO {
/**
* 첨부파일 개수를 조회한다.
*
* @param attachFileId
* @return
* @throws Exception
*/
public int countAttachFiles(String attachFileId) throws Exception;
/** /**
* 첨부파일 목록을 조회한다. * 첨부파일 목록을 조회한다.
* *

12
src/main/java/nlib/bbs/service/impl/AttachFileServiceImpl.java
View File

@ -47,6 +47,18 @@ public class AttachFileServiceImpl implements AttachFileService
@Resource(name = "qnaService") @Resource(name = "qnaService")
private QnaService qnaService; private QnaService qnaService;
/**
* 첨부파일 개수를 조회한다.
*
* @param attachFileId
* @return
* @throws Exception
*/
public int countAttachFiles(String attachFileId) throws Exception {
return attachFileDAO.countAttachFiles(attachFileId);
}
/** /**
* 첨부파일 목록을 조회한다. * 첨부파일 목록을 조회한다.
* *

48
src/main/java/nlib/bbs/service/impl/QnaServiceImpl.java
View File

@ -12,6 +12,7 @@ import nlib.bbs.service.ArticleVO;
import nlib.bbs.service.AttachFileService; import nlib.bbs.service.AttachFileService;
import nlib.bbs.service.AttachFileVO; import nlib.bbs.service.AttachFileVO;
import nlib.bbs.service.QnaService; import nlib.bbs.service.QnaService;
import nlib.cmm.service.NlibProperty;
import nlib.util.StringUtil; import nlib.util.StringUtil;
import nlib.util.UUID; import nlib.util.UUID;
@ -47,12 +48,13 @@ public class QnaServiceImpl extends BoardServiceImpl implements QnaService
} }
articleVO.setResultCode("S001"); articleVO.setResultCode("S001");
articleVO.setResultMessage("정상적으로 등록되었습니다.");
if(articleVO.getAttachFileCnt() > 0) { if(articleVO.getAttachFileCnt() > 0) {
addAttachFiles(articleVO); addAttachFiles(articleVO);
} }
articleVO.setResultMessage("정상적으로 등록되었습니다." + (StringUtil.isNotEmpty(articleVO.getResultMessage())? "\\\\n " + articleVO.getResultMessage() : ""));
return articleVO; return articleVO;
} }
@ -66,23 +68,39 @@ public class QnaServiceImpl extends BoardServiceImpl implements QnaService
int savedCnt = 0; int savedCnt = 0;
List<AttachFileVO> attachFileList = articleVO.getAttachFiles(); List<AttachFileVO> attachFileList = articleVO.getAttachFiles();
// 최대 개수
int maxFileCount = NlibProperty.getInt("fileupload.max.files", 5);
// 첨부파일그룹 등록 // 첨부파일그룹 등록
int groupCnt = attachFileService.insertAttachFileGroup(attachFileList.get(0)); int groupCnt = attachFileService.insertAttachFileGroup(attachFileList.get(0));
if(groupCnt > 0) { if(groupCnt > 0) {
int curFileCount = attachFileService.countAttachFiles(articleVO.getBdAttachFileId());
int addingCount = maxFileCount - curFileCount;
// 첨부파일 등록 // 첨부파일 등록
for(int i=0; i<attachFileList.size(); i++) { if(addingCount > 0) {
AttachFileVO attachFileVO = attachFileList.get(i); for(int i=0; i<attachFileList.size(); i++) {
int retAttFile = attachFileService.insertAttachFile(attachFileVO);
savedCnt += retAttFile; if(savedCnt >= addingCount) {
if(retAttFile < 1) { String message = "최대 허용 개수가 도달하여 등록을 중단합니다.";
log.error("insertArticle > 첨부파일 등록에 실패하였습니다 : " + attachFileVO.getOrignlFileNm()); log.error(message);
articleVO.setResultMessage(message);
break;
}
AttachFileVO attachFileVO = attachFileList.get(i);
int retAttFile = attachFileService.insertAttachFile(attachFileVO);
savedCnt += retAttFile;
if(retAttFile < 1) {
log.error("insertArticle > 첨부파일 등록에 실패하였습니다 : " + attachFileVO.getOrignlFileNm());
}
} }
} }
if(savedCnt != articleVO.getAttachFileCnt()) { if(savedCnt != articleVO.getAttachFileCnt()) {
articleVO.setResultMessage(String.format("총 %d개 파일 중 %개 파일만 정상등록되었습니다.", articleVO.getAttachFileCnt(), savedCnt)); articleVO.setResultMessage("총 " + articleVO.getAttachFileCnt() + "개 파일 중 " + savedCnt + "개 파일만 정상등록되었습니다.");
} }
} else { } else {
@ -135,21 +153,21 @@ public class QnaServiceImpl extends BoardServiceImpl implements QnaService
* @return * @return
*/ */
public int updateArticle(ArticleVO articleVO) throws Exception { public int updateArticle(ArticleVO articleVO) throws Exception {
int updateRet = qnaDAO.updateArticle(articleVO); int updateRet = qnaDAO.updateArticle(articleVO);
// 첨부파일 삭제
List<AttachFileVO> removedAttachFiles = articleVO.getRemovedAttachFiles();
if(removedAttachFiles != null && removedAttachFiles.size() > 0) {
removeAttachFiles(articleVO);
}
// 첨부파일 추가 // 첨부파일 추가
List<AttachFileVO> addedFiles = articleVO.getAttachFiles(); List<AttachFileVO> addedFiles = articleVO.getAttachFiles();
if(addedFiles != null && addedFiles.size() > 0) { if(addedFiles != null && addedFiles.size() > 0) {
addAttachFiles(articleVO); addAttachFiles(articleVO);
} }
List<AttachFileVO> removedAttachFiles = articleVO.getRemovedAttachFiles();
if(removedAttachFiles != null && removedAttachFiles.size() > 0) {
removeAttachFiles(articleVO);
}
// 첨부파일 삭제
return updateRet; return updateRet;
} }

21
src/main/java/nlib/bbs/web/QnaController.java
View File

@ -10,7 +10,6 @@ import java.util.Map;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringEscapeUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -38,6 +37,7 @@ import nlib.cmm.service.NlibProperty;
import nlib.cmm.service.PagingVO; import nlib.cmm.service.PagingVO;
import nlib.user.service.NlibLoginVO; import nlib.user.service.NlibLoginVO;
import nlib.util.StringUtil; import nlib.util.StringUtil;
import nlib.util.UUID;
@Controller @Controller
public class QnaController extends NlibCommonController { public class QnaController extends NlibCommonController {
@ -223,6 +223,11 @@ public class QnaController extends NlibCommonController {
model.addAttribute("searchArticle", searchArticleVO); model.addAttribute("searchArticle", searchArticleVO);
// 첨부파일 업로드 설정값
model.addAttribute("maxFilesize" , NlibProperty.getString("fileupload.max.mbsize"));
model.addAttribute("maxFiles" , NlibProperty.getString("fileupload.max.files"));
model.addAttribute("acceptedFiles", NlibProperty.getString("fileupload.acceptable.ext"));
return "nlib/bbs/insertQnaForm"; return "nlib/bbs/insertQnaForm";
} }
@ -245,6 +250,8 @@ public class QnaController extends NlibCommonController {
, RedirectAttributes redirectAttrs , RedirectAttributes redirectAttrs
, ModelMap model) throws Exception { , ModelMap model) throws Exception {
log.debug("========================================> insertQna : 진입함");
NlibLoginVO loginVO = getNlibLoginVO(authentication); NlibLoginVO loginVO = getNlibLoginVO(authentication);
String message = null; String message = null;
@ -301,6 +308,7 @@ public class QnaController extends NlibCommonController {
String attachFileId = (String)(fileListObj.get(0).get("attachFileId")); String attachFileId = (String)(fileListObj.get(0).get("attachFileId"));
if(StringUtil.isEmpty(attachFileId)) { if(StringUtil.isEmpty(attachFileId)) {
log.error("첨부파일 아이디(attachFileId) 값은 필수 항목입니다. 첨부파일 처리에 실패하였습니다. 그러나, 게시물 등록은 계속 진행됩니다."); log.error("첨부파일 아이디(attachFileId) 값은 필수 항목입니다. 첨부파일 처리에 실패하였습니다. 그러나, 게시물 등록은 계속 진행됩니다.");
attachFileId = UUID.getNewAttachFileId();
} }
if(StringUtil.isNotEmpty(attachFileId)) { if(StringUtil.isNotEmpty(attachFileId)) {
@ -309,7 +317,10 @@ public class QnaController extends NlibCommonController {
String fileSStreCours = NlibProperty.getProperty("fileupload.base.path") + NlibProperty.getProperty("fileupload.bbs.qna.subpath") + "/"; String fileSStreCours = NlibProperty.getProperty("fileupload.base.path") + NlibProperty.getProperty("fileupload.bbs.qna.subpath") + "/";
List<AttachFileVO> attachFiles = new ArrayList<AttachFileVO>(); List<AttachFileVO> attachFiles = new ArrayList<AttachFileVO>();
for(int i=0; i<fileListObj.size(); i++) { // 최대 개수
int maxFileCount = NlibProperty.getInt("fileupload.max.files", 5);
for(int i=0; i<maxFileCount && i<fileListObj.size(); i++) {
Map finfo = fileListObj.get(i); Map finfo = fileListObj.get(i);
AttachFileVO fVO = new AttachFileVO(); AttachFileVO fVO = new AttachFileVO();
@ -383,6 +394,8 @@ public class QnaController extends NlibCommonController {
//--------------------------- //---------------------------
// 첨부파일 정보 설정 // 첨부파일 정보 설정
//--------------------------- //---------------------------
// 추가 첨부파일
if(StringUtil.isNotEmpty(fileList)) { if(StringUtil.isNotEmpty(fileList)) {
String fileListJsonStr = fileList; String fileListJsonStr = fileList;
@ -472,13 +485,11 @@ public class QnaController extends NlibCommonController {
String attachFileId = (String)(removedFileListObj.get(0).get("attachFileId")); String attachFileId = (String)(removedFileListObj.get(0).get("attachFileId"));
if(StringUtil.isEmpty(attachFileId)) { if(StringUtil.isEmpty(attachFileId)) {
log.error("첨부파일 아이디(attachFileId) 값은 필수 항목입니다. 첨부파일 삭제에 실패하였습니다. 그러나, 게시물 등록은 계속 진행됩니다."); log.error("첨부파일 아이디(attachFileId) 값은 필수 항목입니다. 첨부파일 삭제에 실패하였습니다. 그러나, 게시물 변경은 계속 진행됩니다.");
} }
if(StringUtil.isNotEmpty(attachFileId) && attachFileId.equals(articleVO.getBdAttachFileId())) { if(StringUtil.isNotEmpty(attachFileId) && attachFileId.equals(articleVO.getBdAttachFileId())) {
//articleVO.setBdAttachFileId(attachFileId);
//String fileSStreCours = NlibProperty.getProperty("fileupload.base.path") + NlibProperty.getProperty("fileupload.bbs.qna.subpath") + "/";
List<AttachFileVO> removedAttachFiles = new ArrayList<AttachFileVO>(); List<AttachFileVO> removedAttachFiles = new ArrayList<AttachFileVO>();
for(int i=0; i<removedFileListObj.size(); i++) { for(int i=0; i<removedFileListObj.size(); i++) {

45
src/main/java/nlib/cmm/fileupload/FileUploadController.java
View File

@ -8,6 +8,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import javax.activation.MimetypesFileTypeMap;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
@ -17,6 +18,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.security.access.annotation.Secured;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
@ -93,12 +95,12 @@ public class FileUploadController extends NlibCommonController {
* @param response : 파일정보를 담은 JSON String * @param response : 파일정보를 담은 JSON String
* @return * @return
*/ */
@Secured("ROLE_USER")
@ResponseBody @ResponseBody
@RequestMapping(value="/fileupload/uploadFilesAjax.do", produces="application/json") @RequestMapping(value="/fileupload/uploadFilesAjax.do", produces="application/json")
public ResponseEntity uploadFilesAjax( public ResponseEntity uploadFilesAjax(
final MultipartHttpServletRequest multiRequest final MultipartHttpServletRequest multiRequest
, @RequestParam(name="subPathKey") String subPathKey , @RequestParam(name="subPathKey") String subPathKey
, @RequestParam(name="attachFileId", required=false) String attachFileId
, HttpServletResponse response) { , HttpServletResponse response) {
String message = null; String message = null;
@ -153,12 +155,26 @@ public class FileUploadController extends NlibCommonController {
String filePath = ""; String filePath = "";
AttachFileVO atvo; AttachFileVO atvo;
// 첨브파일그룹ID // 허용 파일 확장자
if(StringUtil.isEmpty(attachFileId)) { String acceptableExtList = StringUtil.getString(NlibProperty.getString("fileupload.acceptable.ext"), null);
attachFileId = UUID.getNewAttachFileId(); if(acceptableExtList != null) acceptableExtList = "," + acceptableExtList.trim();
} boolean acceptableExt = false;
// 최대 파일크기
int maxFileSize = NlibProperty.getInt("fileupload.max.mbsize", 10) * 1024 * 1024;
// 최대 개수
int maxFileCount = NlibProperty.getInt("fileupload.max.files", 5);
while (itr.hasNext()) { while (itr.hasNext()) {
if(result.size() >= maxFileCount) {
log.error("최대 개수를 초과하여 이후 파일은 처리되지 않습니다.");
break;
}
acceptableExt = false;
Entry<String, MultipartFile> entry = itr.next(); Entry<String, MultipartFile> entry = itr.next();
file = entry.getValue(); file = entry.getValue();
@ -176,10 +192,25 @@ public class FileUploadController extends NlibCommonController {
int index = orignlFileNm.lastIndexOf("."); int index = orignlFileNm.lastIndexOf(".");
String fileExt = (index < 1 ? "" : orignlFileNm.substring(index + 1)); String fileExt = (index < 1 ? "" : orignlFileNm.substring(index + 1));
//String newName = UUID.getPhysicalFileName(); if(acceptableExtList != null) {
if(acceptableExtList.contains("." + fileExt)) {
acceptableExt = true;
} else if(acceptableExtList.contains("image/*")) {
acceptableExt = ".jpg,.jpe,.jpge,.bmp,.gif,.png".contains("." + fileExt);
}
}
if(!acceptableExt) {
log.error("허용되지 않는 파일 확장자 입니다. : " + orignlFileNm);
continue;
}
int size = (int)file.getSize(); int size = (int)file.getSize();
if(size > maxFileSize) {
log.error("첨부파일이 허용 크기를 초과합니다. : " + orignlFileNm);
continue;
}
String streFileNm = UUID.getNewStreFileNm(); String streFileNm = UUID.getNewStreFileNm();
filePath = FILEUPLOAD_BASE_PATH + subPath + "/" + streFileNm; filePath = FILEUPLOAD_BASE_PATH + subPath + "/" + streFileNm;
@ -189,7 +220,7 @@ public class FileUploadController extends NlibCommonController {
atvo = new AttachFileVO(); atvo = new AttachFileVO();
atvo.setSubPathKey(subPathKey); atvo.setSubPathKey(subPathKey);
atvo.setAttachFileId(attachFileId); //atvo.setAttachFileId(attachFileId); // 실제 DB 저장 처리될때 설정함
atvo.setStreFileNm(streFileNm); atvo.setStreFileNm(streFileNm);
atvo.setOrignlFileNm(orignlFileNm); atvo.setOrignlFileNm(orignlFileNm);
atvo.setFileExt(fileExt); atvo.setFileExt(fileExt);

2
src/main/java/nlib/sch/web/NlibSearchController.java
View File

@ -107,9 +107,11 @@ public class NlibSearchController extends NlibCommonController {
if(fromMenu) { if(fromMenu) {
String sfield = searchVO.getSfield(); String sfield = searchVO.getSfield();
String query = searchVO.getQuery(); String query = searchVO.getQuery();
String collection = searchVO.getCollection();
searchVO = new NlibSearchVO(); searchVO = new NlibSearchVO();
searchVO.setSfield(sfield); searchVO.setSfield(sfield);
searchVO.setQuery(query); searchVO.setQuery(query);
searchVO.setCollection(collection);
} }
if(!fromMenu && !isValidCsrfToken(request, csrfToken)) if(!fromMenu && !isValidCsrfToken(request, csrfToken))

10
src/main/resources/egovframework/mapper/nlib/bbs/AttachFileDAO_SQL.xml
View File

@ -3,6 +3,16 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="nlib.bbs.service.impl.AttachFileDAO"> <mapper namespace="nlib.bbs.service.impl.AttachFileDAO">
<select id="countAttachFiles" parameterType="String" resultType="int">
SELECT COUNT(B.FILE_SN)
FROM BD_FILE A
JOIN BD_FILEDETAIL B ON (A.ATTACH_FILE_ID = B.ATTACH_FILE_ID)
WHERE A.ATTACH_FILE_ID = #{attachFileId}
AND IFNULL(A.USE_AT,'Y') = 'Y'
AND IFNULL(B.USE_AT,'Y') = 'Y'
ORDER BY B.FILE_SN
</select>
<select id="listAttachFiles" parameterType="String" resultType="AttachFileVO"> <select id="listAttachFiles" parameterType="String" resultType="AttachFileVO">
SELECT SELECT
B.ATTACH_FILE_ID B.ATTACH_FILE_ID

7
src/main/resources/nlib/nlib.properties
View File

@ -95,6 +95,13 @@ main.banner.img.path = /apps/tomcat/apache-tomcat-8.5.46_nlib/webapps/images/bg/
#fileupload.base.path = C:/iams/workspace/nlib/data/fileupload #fileupload.base.path = C:/iams/workspace/nlib/data/fileupload
# \uac1c\ubc1c\uc11c\ubc84 # \uac1c\ubc1c\uc11c\ubc84
fileupload.base.path = /nfs_nas_dev/uac/nlib/qna fileupload.base.path = /nfs_nas_dev/uac/nlib/qna
# \ucd5c\ub300 \ud30c\uc77c \ud06c\uae30 (MB)
fileupload.max.mbsize = 10
# \ucd5c\ub300 \ud30c\uc77c \uac1c\uc218
fileupload.max.files = 5
# \ud30c\uc77c \uc5c5\ub85c\ub4dc \uac00\ub2a5 \ud655\uc7a5\uc790 (\uc911\uac04\uc5d0 \uacf5\ubc31\uc774 \uc5c6\uc5b4\uc57c\ud568)
fileupload.acceptable.ext = image/*,.hwp,.xls,.xlsx,.ppt,.pptx,.doc,.docx,.txt
# \uc784\uc2dc \uc800\uc7a5 \uc704\uce58 # \uc784\uc2dc \uc800\uc7a5 \uc704\uce58
fileupload.temp.subpath = /temp fileupload.temp.subpath = /temp

9
src/main/webapp/WEB-INF/jsp/nlib/bbs/insertQnaForm.jsp
View File

@ -94,12 +94,21 @@ $(window.document).ready(function() {
var re = /(?:\.([^.]+))?$/; var re = /(?:\.([^.]+))?$/;
<c:forEach var="attachFile" items="${searchArticle.attachFiles }" varStatus="status"> <c:forEach var="attachFile" items="${searchArticle.attachFiles }" varStatus="status">
myDropzone.addFile({ myDropzone.addFile({
<<<<<<< HEAD
name: '<c:out value="${attachFile.orignlFileNm}" />', name: '<c:out value="${attachFile.orignlFileNm}" />',
size: <c:out value="${attachFile.fileSize}" />, size: <c:out value="${attachFile.fileSize}" />,
type:re.exec('<c:out value="${attachFile.orignlFileNm}" />')[1], type:re.exec('<c:out value="${attachFile.orignlFileNm}" />')[1],
attachFileId: '<c:out value="${attachFile.attachFileId}" />', attachFileId: '<c:out value="${attachFile.attachFileId}" />',
streFileNm: '<c:out value="${attachFile.streFileNm}" />', streFileNm: '<c:out value="${attachFile.streFileNm}" />',
fileSn: '<c:out value="${attachFile.fileSn}" />', fileSn: '<c:out value="${attachFile.fileSn}" />',
=======
name: '<c:out value='${attachFile.orignlFileNm}'/>',
size:<c:out value='${attachFile.fileSize}'/>,
type:re.exec('<c:out value='${attachFile.orignlFileNm}'/>')[1],
attachFileId: '<c:out value='${attachFile.attachFileId}'/>',
streFileNm: '<c:out value='${attachFile.streFileNm}'/>',
fileSn: '<c:out value='${attachFile.fileSn}'/>',
>>>>>>> refs/remotes/origin/master
fileUploadType: 'uploaded' fileUploadType: 'uploaded'
}); });
</c:forEach> </c:forEach>

2
src/main/webapp/WEB-INF/jsp/nlib/bbs/listFaqs.jsp
View File

@ -246,7 +246,7 @@ function fn_changeQuestionType(searchQuestionType) {
<ul class="tabs"> <ul class="tabs">
<li><a href="javascript:void(0);" onclick="fn_changeQuestionType('')">전체</a></li> <li><a href="javascript:void(0);" onclick="fn_changeQuestionType('')">전체</a></li>
<c:forEach var="qTypeItem" items="${questionTypeList }"> <c:forEach var="qTypeItem" items="${questionTypeList }">
<li><a href="javascript:void(0);" onclick="fn_changeQuestionType('${qTypeItem.sCodeId}')">${qTypeItem.sCodeNm}</a></li> <li><a href="javascript:void(0);" onclick="fn_changeQuestionType('<c:out value='${qTypeItem.sCodeId}'/>')"><c:out value='${qTypeItem.sCodeNm}'/></a></li>
</c:forEach> </c:forEach>
</ul> </ul>

10
src/main/webapp/WEB-INF/jsp/nlib/bbs/selectAncmntArticle.jsp
View File

@ -31,7 +31,7 @@
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
<c:set var="pageTitle">공지사항 - 상세조회</c:set> <c:set var="pageTitle"><c:out value='${article.title}'/></c:set>
<script> <script>
@ -80,10 +80,10 @@ function fn_downloadFile(attachFileId, fileSn) {
<ul class="loc"> <ul class="loc">
<li>HOME</li> <li>HOME</li>
<li>고객지원</li> <li>고객지원</li>
<li class="on"><c:out value='${pageTitle }'/></li> <li class="on">공지사항 - 상세조회</li>
</ul> </ul>
<div class="tit"> <div class="tit">
<h2><span><c:out value='${pageTitle }'/></span></h2> <h2><span>공지사항 - 상세조회</span></h2>
</div> </div>
</div> </div>
<div class="arr"><img src="/images/icon/icon-join-arr2.png" alt=""></div> <div class="arr"><img src="/images/icon/icon-join-arr2.png" alt=""></div>
@ -111,8 +111,8 @@ function fn_downloadFile(attachFileId, fileSn) {
<c:forEach var="attachFile" items="${article.attachFiles }"> <c:forEach var="attachFile" items="${article.attachFiles }">
<div class="file-list"> <div class="file-list">
<span><img src="/images/icon/icon-file.png" alt="파일 아이콘"></span> <span><img src="/images/icon/icon-file.png" alt="파일 아이콘"></span>
<span><button type="button" onclick="fn_downloadFile('${attachFile.attachFileId}', ${attachFile.fileSn})">${attachFile.orignlFileNm}, ${attachFile.fileSize} byte(s)</button></span> <span><button type="button" onclick="fn_downloadFile('<c:out value='${attachFile.attachFileId}'/>', <c:out value='${attachFile.fileSn}'/>)"><c:out value='${attachFile.orignlFileNm}'/>, <c:out value='${attachFile.fileSize}'/> byte(s)</button></span>
<span><button type="button" onclick="fn_downloadFile('${attachFile.attachFileId}', ${attachFile.fileSn})">다운로드</button></span> <span><button type="button" onclick="fn_downloadFile('<c:out value='${attachFile.attachFileId}'/>', <c:out value='${attachFile.fileSn}'/>)">다운로드</button></span>
</div> </div>
</c:forEach> </c:forEach>
</div> </div>

4
src/main/webapp/WEB-INF/jsp/nlib/bbs/selectQnaArticle.jsp
View File

@ -136,8 +136,8 @@ function fn_downloadFile(attachFileId, fileSn) {
<c:forEach var="attachFile" items="${article.attachFiles }"> <c:forEach var="attachFile" items="${article.attachFiles }">
<div class="file-list"> <div class="file-list">
<span><img src="/images/icon/icon-file.png" alt="파일"></span> <span><img src="/images/icon/icon-file.png" alt="파일"></span>
<span><button type="button" onclick="fn_downloadFile('${attachFile.attachFileId}', ${attachFile.fileSn})">${attachFile.orignlFileNm}, ${attachFile.fileSize} byte(s)</button></span> <span><button type="button" onclick="fn_downloadFile('<c:out value='${attachFile.attachFileId}'/>', <c:out value='${attachFile.fileSn}'/>)"><c:out value='${attachFile.orignlFileNm}'/>, <c:out value='${attachFile.fileSize}'/> byte(s)</button></span>
<span><button type="button" onclick="fn_downloadFile('${attachFile.attachFileId}', ${attachFile.fileSn})">다운로드</button></span> <span><button type="button" onclick="fn_downloadFile('<c:out value='${attachFile.attachFileId}'/>', <c:out value='${attachFile.fileSn}'/>)">다운로드</button></span>
</div> </div>
</c:forEach> </c:forEach>
</div> </div>

54
src/main/webapp/WEB-INF/jsp/nlib/cart/listCartItems.jsp
View File

@ -293,22 +293,22 @@ $(document).ready(function() {
<c:if test="${status.count > 1 }"> <c:if test="${status.count > 1 }">
</div> </div>
<script> <script>
$("#_${preMngOrgCd}_cnt").text("${mngOrgCdCnt }"); $("#_<c:out value='${preMngOrgCd}'/>_cnt").text("<c:out value='${mngOrgCdCnt }'/>");
$("#_${preMngOrgCd}_cntMo").text("${mngOrgCdCnt }"); $("#_<c:out value='${preMngOrgCd}'/>_cntMo").text("<c:out value='${mngOrgCdCnt }'/>");
</script> </script>
</c:if> </c:if>
<c:set var="mngOrgCdCnt" value="0" /> <c:set var="mngOrgCdCnt" value="0" />
<!-- 문화원 시작 --> <!-- 문화원 시작 -->
<h3><label for="selMngOrgCd_${cart.mngOrgCd}"> <h3><label for="selMngOrgCd_<c:out value='${cart.mngOrgCd}'/>">
<input type="radio" id="selMngOrgCd_${cart.mngOrgCd}" name="selMngOrgCd" value="${cart.mngOrgCd}"> <input type="radio" id="selMngOrgCd_<c:out value='${cart.mngOrgCd}'/>" name="selMngOrgCd" value="<c:out value='${cart.mngOrgCd}'/>">
<span id="_${cart.mngOrgCd}_nm">${cart.mngOrgNm }</span> (<span class="count" id="_${cart.mngOrgCd}_cnt"></span>)</label></h3> <span id="_<c:out value='${cart.mngOrgCd}'/>_nm"><c:out value='${cart.mngOrgNm }'/></span> (<span class="count" id="_<c:out value='${cart.mngOrgCd}'/>_cnt"></span>)</label></h3>
<div class="list-cart"> <div class="list-cart">
<div class="list t-tit-line"> <div class="list t-tit-line">
<div class="t-chk"> <div class="t-chk">
<input type="checkbox" id="chk_all_${cart.mngOrgCd }" name="chk_all_${cart.mngOrgCd }" onclick="fn_selectAll('${cart.mngOrgCd}')"> <input type="checkbox" id="chk_all_<c:out value='${cart.mngOrgCd }'/>" name="chk_all_<c:out value='${cart.mngOrgCd }'/>" onclick="fn_selectAll('<c:out value='${cart.mngOrgCd}'/>')">
<label for="chk_all_${cart.mngOrgCd }" style="display:none">전체자료선택</label> <label for="chk_all_<c:out value='${cart.mngOrgCd }'/>" style="display:none">전체자료선택</label>
<span class="mo-ver"><strong>전체선택</strong></span> (<span id="appCntMo_${cart.mngOrgCd}" class="count">0</span>/<span class="count" id="_${cart.mngOrgCd}_cntMo">0</span>) <span class="mo-ver"><strong>전체선택</strong></span> (<span id="appCntMo_<c:out value='${cart.mngOrgCd}'/>" class="count">0</span>/<span class="count" id="_<c:out value='${cart.mngOrgCd}'/>_cntMo">0</span>)
</div> </div>
<div class="t-data t-mo">자료정보</div> <div class="t-data t-mo">자료정보</div>
<div class="t-state t-mo">이용상태</div> <div class="t-state t-mo">이용상태</div>
@ -325,26 +325,26 @@ $(document).ready(function() {
<!-- 행 : 시작 --> <!-- 행 : 시작 -->
<div class="list list-content"> <div class="list list-content">
<div class="t-chk"><input type="checkbox" name="chk_item_${cart.mngOrgCd }" <div class="t-chk"><input type="checkbox" name="chk_item_<c:out value='${cart.mngOrgCd }'/>"
id="chk_item_${cart.mngOrgCd }" id="chk_item_<c:out value='${cart.mngOrgCd }'/>"
value="${cart.masterId }" value="<c:out value='${cart.masterId }'/>"
data-ableRent="${cart.ableRent }" data-ableRent="<c:out value='${cart.ableRent }'/>"
data-ableRead="${cart.ableRead }" data-ableRead="<c:out value='${cart.ableRead }'/>"
data-ableRentNow="${cart.ableRentNow }" data-ableRentNow="<c:out value='${cart.ableRentNow }'/>"
data-ableReadNow="${cart.ableReadNow }" data-ableReadNow="<c:out value='${cart.ableReadNow }'/>"
><label for="chk_item_${cart.mngOrgCd }" class="blind">문화원선택</label></div> ><label for="chk_item_<c:out value='${cart.mngOrgCd }'/>" class="blind">문화원선택</label></div>
<div class="t-data"> <div class="t-data">
<div class="img">${cart.interestYn } <div class="img"><c:out value='${cart.interestYn }'/>
<a href="javascript:void(0)"><img src="${cart.rprsThumbUrlWithDefaultSmall }" alt="썸네일" width="60" height="91" title="상세보기" onclick="gfn_getDetail('${cart.masterId }')"></a> <a href="javascript:void(0)"><img src="<c:out value='${cart.rprsThumbUrlWithDefaultSmall }'/>" alt="썸네일" width="60" height="91" title="상세보기" onclick="gfn_getDetail('<c:out value='${cart.masterId }'/>')"></a>
<sec:authorize access="isAuthenticated()"> <sec:authorize access="isAuthenticated()">
<c:if test='${cart.MUseYn == "Y"}'> <c:if test='${cart.MUseYn == "Y"}'>
<span id="favorites_${cart.masterId }" class="favorites" onclick="gfn_changeInterest('${cart.masterId }', 'off')" title="관심자료에서 삭제합니다."> <span id="favorites_<c:out value='${cart.masterId }'/>" class="favorites" onclick="gfn_changeInterest('<c:out value='${cart.masterId }'/>', 'off')" title="관심자료에서 삭제합니다.">
<img src="/images/icon/icon-cart-Favorites-on.png" class="off" alt="즐겨찾기 아이콘"> <img src="/images/icon/icon-cart-Favorites-on.png" class="off" alt="즐겨찾기 아이콘">
<img src="/images/icon/icon-cart-Favorites.png" class="on" alt="즐겨찾기 아이콘"> <img src="/images/icon/icon-cart-Favorites.png" class="on" alt="즐겨찾기 아이콘">
</span> </span>
</c:if> </c:if>
<c:if test='${cart.MUseYn != "Y"}'> <c:if test='${cart.MUseYn != "Y"}'>
<span id="favorites_${cart.masterId }" class="favorites" onclick="gfn_changeInterestBtn('${cart.masterId }', 'on')" title="관심자료로 등록합니다."> <span id="favorites_<c:out value='${cart.masterId }'/>" class="favorites" onclick="gfn_changeInterestBtn('<c:out value='${cart.masterId }'/>', 'on')" title="관심자료로 등록합니다.">
<img src="/images/icon/icon-cart-Favorites.png" class="off" alt="즐겨찾기 아이콘"> <img src="/images/icon/icon-cart-Favorites.png" class="off" alt="즐겨찾기 아이콘">
<img src="/images/icon/icon-cart-Favorites-on.png" class="on" alt="즐겨찾기 아이콘"> <img src="/images/icon/icon-cart-Favorites-on.png" class="on" alt="즐겨찾기 아이콘">
</span> </span>
@ -365,12 +365,12 @@ $(document).ready(function() {
</c:if> </c:if>
</div> </div>
<div class="title"><a href="javascript:void(0)" onclick="gfn_getDetail('${cart.masterId }')" title="상세보기">${cart.title }</a></div> <div class="title"><a href="javascript:void(0)" onclick="gfn_getDetail('<c:out value='${cart.masterId }'/>')" title="상세보기"><c:out value='${cart.title }'/></a></div>
</div> </div>
<div class="t-state <c:if test="${cart.useStatus != '03' and cart.useStatus != '06' }">poss</c:if> <c:if test="${cart.useStatus == '03' or cart.useStatus == '06' }">imposs</c:if>"><p>${cart.useStatusNm }</p></div> <div class="t-state <c:if test="${cart.useStatus != '03' and cart.useStatus != '06' }">poss</c:if> <c:if test="${cart.useStatus == '03' or cart.useStatus == '06' }">imposs</c:if>"><p><c:out value='${cart.useStatusNm }'/></p></div>
<div class="t-date">${cart.rtnExpctDd }</div> <div class="t-date"><c:out value='${cart.rtnExpctDd }'/></div>
<div class="t-loan <c:if test="${cart.ableRentNow }">poss</c:if> <c:if test="${!cart.ableRentNow }">imposs</c:if>">${cart.ableRentNowNm }</div> <div class="t-loan <c:if test="${cart.ableRentNow }">poss</c:if> <c:if test="${!cart.ableRentNow }">imposs</c:if>"><c:out value='${cart.ableRentNowNm }'/></div>
<div class="t-visit <c:if test="${cart.ableReadNow }">poss</c:if> <c:if test="${!cart.ableReadNow }">imposs</c:if>">${cart.ableReadNowNm }</div> <div class="t-visit <c:if test="${cart.ableReadNow }">poss</c:if> <c:if test="${!cart.ableReadNow }">imposs</c:if>"><c:out value='${cart.ableReadNowNm }'/></div>
</div> </div>
<!-- 행 : 종료 --> <!-- 행 : 종료 -->
</c:forEach> </c:forEach>
@ -378,8 +378,8 @@ $(document).ready(function() {
<c:if test="${fn:length(list) > 0 }"> <c:if test="${fn:length(list) > 0 }">
</div> </div>
<script> <script>
$("#_${preMngOrgCd}_cnt").text("${mngOrgCdCnt }"); $("#_<c:out value='${preMngOrgCd}'/>_cnt").text("<c:out value='${mngOrgCdCnt }'/>");
$("#_${preMngOrgCd}_cntMo").text("${mngOrgCdCnt }"); $("#_<c:out value='${preMngOrgCd}'/>_cntMo").text("<c:out value='${mngOrgCdCnt }'/>");
</script> </script>
</c:if> </c:if>

56
src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp
View File

@ -145,17 +145,17 @@ function fn_listPops(typeDivCd) {
<li <c:if test="${fn:length(listBannerInfos) > 1 }"> class="swiper-slide" </c:if> > <li <c:if test="${fn:length(listBannerInfos) > 1 }"> class="swiper-slide" </c:if> >
<div class="img"> <div class="img">
<c:if test="${not empty bannerItem.streFileNm }"> <c:if test="${not empty bannerItem.streFileNm }">
<img src="/main/bannerImage.do?bannerId=${bannerItem.bannerId }" alt=""> <img src="/main/bannerImage.do?bannerId=<c:out value='${bannerItem.bannerId }'/>" alt="">
</c:if> </c:if>
<c:if test="${empty bannerItem.streFileNm }"> <c:if test="${empty bannerItem.streFileNm }">
<img src="/images/bg/bg-mainbanner.jpg" alt=""> <img src="/images/bg/bg-mainbanner.jpg" alt="">
</c:if> </c:if>
</div> </div>
<div class="text"> <div class="text">
<h3>${bannerItem.title }</h3> <h3><c:out value='${bannerItem.title }'/></h3>
<p>${bannerItem.bannerDesc }</p> <p><c:out value='${bannerItem.bannerDesc }'/></p>
<c:if test="${not empty bannerItem.url }"> <c:if test="${not empty bannerItem.url }">
<p><a href="javascript:(0)" onclick="gfn_openNewWindow('${bannerItem.url}')" class="eff">자세히 보기 &#62;</a></p> <p><a href="javascript:(0)" onclick="gfn_openNewWindow('<c:out value='${bannerItem.url}'/>')" class="eff">자세히 보기 &#62;</a></p>
</c:if> </c:if>
</div> </div>
</li> </li>
@ -215,7 +215,7 @@ function fn_listPops(typeDivCd) {
<p class="desc">어떤 자료들을 소장 중인지 키워드로 살펴보세요!</p> <p class="desc">어떤 자료들을 소장 중인지 키워드로 살펴보세요!</p>
<ul class="list-tag"> <ul class="list-tag">
<c:forEach var="itemKeyword" items="${listKeywords }"> <c:forEach var="itemKeyword" items="${listKeywords }">
<li><a href="javascript:void(0)" title="${itemKeyword.keyName }" onclick="fn_search('${itemKeyword.keyName }')"># ${itemKeyword.keyName }</a> <li><a href="javascript:void(0)" title="<c:out value='${itemKeyword.keyName }'/>" onclick="fn_search('<c:out value='${itemKeyword.keyName }'/>')"># <c:out value='${itemKeyword.keyName }'/></a>
</li> </li>
</c:forEach> </c:forEach>
</ul> </ul>
@ -241,11 +241,11 @@ function fn_listPops(typeDivCd) {
<div class="swiper-slide"> <div class="swiper-slide">
<div class="list-box"> <div class="list-box">
<div class="images"><a href="javascript:void(0)" onclick="gfn_getDetail('${itemPick.masterId }')" title="상세정보"><img src="${itemPick.rprsThumbUrlWithDefaultMiddle }" alt="${itemPick.title } 표지"></a></div> <div class="images"><a href="javascript:void(0)" onclick="gfn_getDetail('<c:out value='${itemPick.masterId }'/>')" title="상세정보"><img src="<c:out value='${itemPick.rprsThumbUrlWithDefaultMiddle }'/>" alt="<c:out value='${itemPick.title }'/> 표지"></a></div>
<div class="subject"> <div class="subject">
<a href="javascript:void(0)" onclick="gfn_getDetail('${itemPick.masterId }')" title="상세정보"> <a href="javascript:void(0)" onclick="gfn_getDetail('<c:out value='${itemPick.masterId }'/>')" title="상세정보">
<span class="block"><span class="cla">${itemPick.typeDivNm }</span></span> <span class="block"><span class="cla"><c:out value='${itemPick.typeDivNm }'/></span></span>
<span class="tit underline pink">${itemPick.title }</span> <span class="tit underline pink"><c:out value='${itemPick.title }'/></span>
</a> </a>
</div> </div>
</div> </div>
@ -296,13 +296,13 @@ function fn_listPops(typeDivCd) {
<c:forEach var="itemPop" items="${listPops }"> <c:forEach var="itemPop" items="${listPops }">
<li class="swiper-slide"> <li class="swiper-slide">
<div class="con-1"> <div class="con-1">
<div class="block"><span class="cla">${itemPop.typeDivNm }</span></div> <div class="block"><span class="cla"><c:out value='${itemPop.typeDivNm }'/></span></div>
<button class="tit" onclick="gfn_getDetail('${itemPop.masterId}')">${itemPop.title }</button> <button class="tit" onclick="gfn_getDetail('<c:out value='${itemPop.masterId}'/>')"><c:out value='${itemPop.title }'/></button>
</div> </div>
<div class="con-2"> <div class="con-2">
<p class="sub"><span>주제분야</span><span><c:if test="${empty itemPop.subjectNm }">-</c:if>${itemPop.subjectNm }</span></p> <p class="sub"><span>주제분야</span><span><c:if test="${empty itemPop.subjectNm }">-</c:if><c:out value='${itemPop.subjectNm }'/></span></p>
<p class="age"><span>생산기관</span><span><c:if test="${empty itemPop.orgNm }">-</c:if>${itemPop.orgNm }</span></p> <p class="age"><span>생산기관</span><span><c:if test="${empty itemPop.orgNm }">-</c:if><c:out value='${itemPop.orgNm }'/></span></p>
<p class="yea"><span>생산년도</span><span><c:if test="${empty itemPop.creatYyyy }">-</c:if>${itemPop.creatYyyy }</span></p> <p class="yea"><span>생산년도</span><span><c:if test="${empty itemPop.creatYyyy }">-</c:if><c:out value='${itemPop.creatYyyy }'/></span></p>
</div> </div>
</li> </li>
</c:forEach> </c:forEach>
@ -339,18 +339,18 @@ function fn_listPops(typeDivCd) {
<div class="List"> <div class="List">
<div class="inner"> <div class="inner">
<div class="thumbnail"> <div class="thumbnail">
<span class="image-frame"><img src="${itemOnline.rprsThumbUrlWithDefaultMiddle }" alt="${itemOnline.title } 표지" /></span> <span class="image-frame"><img src="<c:out value='${itemOnline.rprsThumbUrlWithDefaultMiddle }'/>" alt="<c:out value='${itemOnline.title }'/> 표지" /></span>
<div class="detail-cover"> <div class="detail-cover">
<a href="javascript:void(0)" title="상세화면 보기" onclick="gfn_getDetail('${itemOnline.masterId }')" ><strong>${itemOnline.title }</strong></a> <a href="javascript:void(0)" title="상세화면 보기" onclick="gfn_getDetail('<c:out value='${itemOnline.masterId }'/>')" ><strong><c:out value='${itemOnline.title }'/></strong></a>
<ul> <ul>
<li><em>자료유형</em><c:if test="${empty itemOnline.typeDivNm }">-</c:if>${itemOnline.typeDivNm }</li> <li><em>자료유형</em><c:if test="${empty itemOnline.typeDivNm }">-</c:if><c:out value='${itemOnline.typeDivNm }'/></li>
<li><em>주제분야</em><c:if test="${empty itemOnline.subjectNmUp }">-</c:if>${itemOnline.subjectNmUp }</li> <li><em>주제분야</em><c:if test="${empty itemOnline.subjectNmUp }">-</c:if><c:out value='${itemOnline.subjectNmUp }'/></li>
<li><em>생산기관</em><c:if test="${empty itemOnline.orgNm }">-</c:if>${itemOnline.orgNm }</li> <li><em>생산기관</em><c:if test="${empty itemOnline.orgNm }">-</c:if><c:out value='${itemOnline.orgNm }'/></li>
<li><em>생산년도</em><c:if test="${empty itemOnline.creatYyyy }">-</c:if>${itemOnline.creatYyyy }</li> <li><em>생산년도</em><c:if test="${empty itemOnline.creatYyyy }">-</c:if><c:out value='${itemOnline.creatYyyy }'/></li>
</ul> </ul>
<div class="btn-box"> <div class="btn-box">
<div class="view"><a href="javascript:void(0)" onclick="gfn_showDocPdf('${itemOnline.interfaceId }','${itemOnline.masterId }','${itemOnline.typeDivCd}','${itemOnline.dtlsTypeDivCd}')">원문보기</a></div> <div class="view"><a href="javascript:void(0)" onclick="gfn_showDocPdf('<c:out value='${itemOnline.interfaceId }'/>','<c:out value='${itemOnline.masterId }'/>','<c:out value='${itemOnline.typeDivCd}'/>','<c:out value='${itemOnline.dtlsTypeDivCd}'/>')">원문보기</a></div>
<div class="RIS"><a href="javascript:void(0)" onclick="gfn_showRis('${itemOnline.masterId }')">RIS</a></div> <div class="RIS"><a href="javascript:void(0)" onclick="gfn_showRis('<c:out value='${itemOnline.masterId }'/>')">RIS</a></div>
</div> </div>
</div> </div>
</div> </div>
@ -383,10 +383,10 @@ function fn_listPops(typeDivCd) {
<div class="con"> <div class="con">
<c:forEach var="itemAncmnt" items="${listAncmnt }"> <c:forEach var="itemAncmnt" items="${listAncmnt }">
<div class="list"> <div class="list">
<a href="javascript:void(0)" onclick="fn_viewAncmnt('${itemAncmnt.articleId}')"> <a href="javascript:void(0)" onclick="fn_viewAncmnt('<c:out value='${itemAncmnt.articleId}'/>')">
<div class="box"><p>${fn:substring(itemAncmnt.regDd,8,10) }</p><p> ${fn:substring(itemAncmnt.regDd,2,4) }.${fn:substring(itemAncmnt.regDd,5,7) }</p></div> <div class="box"><p><c:out value='${fn:substring(itemAncmnt.regDd,8,10) }'/></p><p> <c:out value='${fn:substring(itemAncmnt.regDd,2,4) }'/>.<c:out value='${fn:substring(itemAncmnt.regDd,5,7) }'/></p></div>
<div class="text"> <div class="text">
<p><c:if test='${itemAncmnt.notiYn == "Y"}'>[공지]</c:if>${itemAncmnt.title} <p><c:if test='${itemAncmnt.notiYn == "Y"}'>[공지]</c:if><c:out value='${itemAncmnt.title}'/>
<c:if test='${itemAncmnt.attachYn == "Y"}'><img src="/images/icon/icon-file.png" class="file" alt="파일 아이콘"></c:if></p> <c:if test='${itemAncmnt.attachYn == "Y"}'><img src="/images/icon/icon-file.png" class="file" alt="파일 아이콘"></c:if></p>
</div> </div>
</a> </a>
@ -400,10 +400,10 @@ function fn_listPops(typeDivCd) {
<div class="con"> <div class="con">
<c:forEach var="itemQna" items="${listQna }"> <c:forEach var="itemQna" items="${listQna }">
<div class="list"> <div class="list">
<a href="javascript:void(0)" onclick="fn_viewQna('${itemQna.articleId}', '${itemQna.secretYn}', '${itemQna.myQnaYn}')"> <a href="javascript:void(0)" onclick="fn_viewQna('<c:out value='${itemQna.articleId}'/>', '<c:out value='${itemQna.secretYn}'/>', '<c:out value='${itemQna.myQnaYn}'/>')">
<div class="box"><p>${fn:substring(itemQna.regDd,8,10) }</p><p> ${fn:substring(itemQna.regDd,2,4) }.${fn:substring(itemQna.regDd,5,7) }</p></div> <div class="box"><p><c:out value='${fn:substring(itemQna.regDd,8,10) }'/></p><p> <c:out value='${fn:substring(itemQna.regDd,2,4) }'/>.<c:out value='${fn:substring(itemQna.regDd,5,7) }'/></p></div>
<div class="text"> <div class="text">
<p>${itemQna.title} <p><c:out value='${itemQna.title}'/>
<c:if test='${itemQna.secretYn == "Y"}'><img src="/images/icon/icon-password.png" class="pw" alt="잠금 아이콘"></c:if> <c:if test='${itemQna.secretYn == "Y"}'><img src="/images/icon/icon-password.png" class="pw" alt="잠금 아이콘"></c:if>
</p> </p>
</div> </div>

2
src/main/webapp/WEB-INF/jsp/nlib/collection/listInterests.jsp
View File

@ -353,7 +353,7 @@
<select name="mngOrgCd" id="mngOrgCd" title="문화원 선택"> <select name="mngOrgCd" id="mngOrgCd" title="문화원 선택">
<option value="">문화원 전체</option> <option value="">문화원 전체</option>
<c:forEach var="deptList" items="${deptList }"> <c:forEach var="deptList" items="${deptList }">
<option value="${deptList.orgCd }" >${deptList.deptNm }</option> <option value="<c:out value='${deptList.orgCd }" ><c:out value='${deptList.deptNm }'/></option>
</c:forEach> </c:forEach>
</select> </select>
</div> </div>

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

@ -413,15 +413,15 @@ function goList(){
<div class="swiper-wrapper"> <div class="swiper-wrapper">
<c:forEach var="result" items="${seeTogetherListVO}" varStatus="status"> <c:forEach var="result" items="${seeTogetherListVO}" varStatus="status">
<div class="swiper-slide"> <div class="swiper-slide">
<div class="List" onclick="goDetail('${result.masterId}');"> <div class="List" onclick="goDetail('<c:out value='${result.masterId}'/>');">
<div class="con-1"> <div class="con-1">
<div class="tit underline pink">${result.title }</div> <div class="tit underline pink"><c:out value='${result.title }'/></div>
</div> </div>
<div class="con-2"> <div class="con-2">
<p class="typ"><span>자료유형</span><span><c:if test="${empty result.typeDivNm and empty result.dtlsTypeDivNm}">-</c:if> ${result.typeDivNm } <c:if test="${!empty result.typeDivNm and !empty result.dtlsTypeDivNm}">&gt;</c:if>${result.dtlsTypeDivNm}</span></p> <p class="typ"><span>자료유형</span><span><c:if test="${empty result.typeDivNm and empty result.dtlsTypeDivNm}">-</c:if> <c:out value='${result.typeDivNm }'/> <c:if test="${!empty result.typeDivNm and !empty result.dtlsTypeDivNm}">&gt;</c:if><c:out value='${result.dtlsTypeDivNm}'/></span></p>
<p class="sub"><span>주제분야</span><span><c:if test="${empty result.subjectNmUp and empty result.subjectNm}">-</c:if> ${result.subjectNm } <c:if test="${!empty result.subjectNmUp and !empty result.subjectNm}">&gt;</c:if>${result.subjectNm}</span></p> <p class="sub"><span>주제분야</span><span><c:if test="${empty result.subjectNmUp and empty result.subjectNm}">-</c:if> <c:out value='${result.subjectNm }'/> <c:if test="${!empty result.subjectNmUp and !empty result.subjectNm}">&gt;</c:if><c:out value='${result.subjectNm}'/></span></p>
<p class="age"><span>생산기관</span><span><c:if test="${empty result.orgNm }">-</c:if>${result.orgNm }</span></p> <p class="age"><span>생산기관</span><span><c:if test="${empty result.orgNm }">-</c:if><c:out value='${result.orgNm }'/></span></p>
<p class="yea"><span>생산년도</span><span><c:if test="${empty result.creatYyyy }">-</c:if>${result.creatYyyy }</span></p> <p class="yea"><span>생산년도</span><span><c:if test="${empty result.creatYyyy }">-</c:if><c:out value='${result.creatYyyy }'/></span></p>
</div> </div>
</div> </div>
</div> </div>
@ -448,7 +448,7 @@ function goList(){
<div class="con-4"> <div class="con-4">
<div class="top"> <div class="top">
<h3><span>이 자료와 유사한</span>자료</h3> <h3><span>이 자료와 유사한</span>자료</h3>
<p><strong>“ <c:forEach items="${mngOrgList }" var="list" varStatus="status"><c:if test="${status.count ne 1}"> ,</c:if>${list }</c:forEach> ”</strong> 에 있습니다</p> <p><strong>“ <c:forEach items="${mngOrgList }" var="list" varStatus="status"><c:if test="${status.count ne 1}"> ,</c:if><c:out value='${list }'/></c:forEach> ”</strong> 에 있습니다</p>
</div> </div>
<div class="bottom"> <div class="bottom">
<!-- Swiper --> <!-- Swiper -->
@ -456,17 +456,17 @@ function goList(){
<div class="swiper-wrapper items cover"> <div class="swiper-wrapper items cover">
<c:forEach var="result" items="${similarListVO}" varStatus="status"> <c:forEach var="result" items="${similarListVO}" varStatus="status">
<div class="swiper-slide"> <div class="swiper-slide">
<div class="List" onclick="gfn_getDetail('${result.masterId}');"> <div class="List" onclick="gfn_getDetail('<c:out value='${result.masterId}'/>');">
<div class="inner"> <div class="inner">
<div class="thumbnail"> <div class="thumbnail">
<span class="image-frame"><img src="${result.rprsThumbUrlWithDefaultMiddle }" alt=""/></span> <span class="image-frame"><img src="<c:out value='${result.rprsThumbUrlWithDefaultMiddle }'/>" alt=""/></span>
<div class="detail-cover"> <div class="detail-cover">
<strong>${result.title }</strong> <strong><c:out value='${result.title }'/></strong>
<ul> <ul>
<li><em>주제유형</em><c:if test="${empty result.typeDivNm}">-</c:if>${result.typeDivNm }</li> <li><em>주제유형</em><c:if test="${empty result.typeDivNm}">-</c:if><c:out value='${result.typeDivNm }'/></li>
<li><em>주제분야</em><c:if test="${empty result.subjectNmUp}">-</c:if>${result.subjectNmUp }</li> <li><em>주제분야</em><c:if test="${empty result.subjectNmUp}">-</c:if><c:out value='${result.subjectNmUp }'/></li>
<li><em>생산기관</em><c:if test="${empty result.orgNm }">-</c:if>${result.orgNm }</li> <li><em>생산기관</em><c:if test="${empty result.orgNm }">-</c:if><c:out value='${result.orgNm }'/></li>
<li><em>생산년도</em><c:if test="${empty result.creatYyyy }">-</c:if>${result.creatYyyy }</li> <li><em>생산년도</em><c:if test="${empty result.creatYyyy }">-</c:if><c:out value='${result.creatYyyy }'/></li>
</ul> </ul>
</div> </div>
</div> </div>

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

@ -270,16 +270,16 @@ function fn_search_article(pageIndex) {
<li> <li>
<div class="depth-1 <c:if test="${fn:contains(searchVO.filter_class, firstClassList.column1) }"> on</c:if>"> <div class="depth-1 <c:if test="${fn:contains(searchVO.filter_class, firstClassList.column1) }"> on</c:if>">
<div class="check"> <div class="check">
<input type="checkbox" value="${firstClassList.column1}" name="first_class" id="data-type-chk${fcStatus.index+1}" <c:if test="${fn:contains(searchVO.filter_class, firstClassList.column1) }">checked="checked"</c:if> /> <input type="checkbox" value="<c:out value='${firstClassList.column1}'/>" name="first_class" id="data-type-chk<c:out value='${fcStatus.index+1}'/>" <c:if test="${fn:contains(searchVO.filter_class, firstClassList.column1) }">checked="checked"</c:if> />
<label for="data-type-chk${fcStatus.index+1}">${firstClassList.sCodeNm}(<span>${firstClassList.cnt }</span>) </label> <label for="data-type-chk<c:out value='${fcStatus.index+1}'/>"><c:out value='${firstClassList.sCodeNm}'/>(<span><c:out value='${firstClassList.cnt }'/></span>) </label>
</div> </div>
</div> </div>
<ul class="depth-2"> <ul class="depth-2">
<c:forEach var="secondClassList" items="${secondClassList}" varStatus="seStatus"> <c:forEach var="secondClassList" items="${secondClassList}" varStatus="seStatus">
<c:if test="${firstClassList.column1 eq secondClassList.column2 }"> <c:if test="${firstClassList.column1 eq secondClassList.column2 }">
<li> <li>
<div class="check"><input type="checkbox" value="${secondClassList.sCodeId}" name="second_class" id="data-type-chk${fcStatus.index+1}-${seStatus.index+1}" <c:if test="${fn:contains(searchVO.second_class, secondClassList.sCodeId) }">checked="checked"</c:if> /> <div class="check"><input type="checkbox" value="<c:out value='${secondClassList.sCodeId}'/>" name="second_class" id="data-type-chk<c:out value='${fcStatus.index+1}'/>-<c:out value='${seStatus.index+1}'/>" <c:if test="${fn:contains(searchVO.second_class, secondClassList.sCodeId) }">checked="checked"</c:if> />
<label for="data-type-chk${fcStatus.index+1}-${seStatus.index+1}">${secondClassList.sCodeNm}(<span>${secondClassList.cnt }</span>)</label> <label for="data-type-chk<c:out value='${fcStatus.index+1}'/>-<c:out value='${seStatus.index+1}'/>"><c:out value='${secondClassList.sCodeNm}'/>(<span><c:out value='${secondClassList.cnt }'/></span>)</label>
</div> </div>
</li> </li>
</c:if> </c:if>
@ -303,12 +303,12 @@ function fn_search_article(pageIndex) {
<c:if test="${firstCategoryInfo.upClsfId eq '2' }"> <c:if test="${firstCategoryInfo.upClsfId eq '2' }">
<li> <li>
<div class="depth-1 <c:if test="${fn:contains(searchVO.filter_category, firstCategoryInfo.clsfId) }"> on</c:if>"> <div class="depth-1 <c:if test="${fn:contains(searchVO.filter_category, firstCategoryInfo.clsfId) }"> on</c:if>">
<div class="check"><input type="checkbox" value="${firstCategoryInfo.clsfId}" id="theme-chk${count+1}" name="first_category" <c:if test="${fn:contains(searchVO.filter_category, firstCategoryInfo.clsfId) }">checked="checked"</c:if>/><label for="theme-chk${count+1}">${firstCategoryInfo.clsfNm}(<span>${firstCategoryInfo.cnt}</span>)</label></div> <div class="check"><input type="checkbox" value="<c:out value='${firstCategoryInfo.clsfId}'/>" id="theme-chk<c:out value='${count+1}'/>" name="first_category" <c:if test="${fn:contains(searchVO.filter_category, firstCategoryInfo.clsfId) }">checked="checked"</c:if>/><label for="theme-chk<c:out value='${count+1}'/>"><c:out value='${firstCategoryInfo.clsfNm}'/>(<span><c:out value='${firstCategoryInfo.cnt}'/></span>)</label></div>
</div> </div>
<ul class="depth-2"> <ul class="depth-2">
<c:forEach var="secondCategoryInfo" items="${secondCategoryList}" varStatus="seStatus"> <c:forEach var="secondCategoryInfo" items="${secondCategoryList}" varStatus="seStatus">
<c:if test="${firstCategoryInfo.clsfId eq secondCategoryInfo.upClsfId }"> <c:if test="${firstCategoryInfo.clsfId eq secondCategoryInfo.upClsfId }">
<li><div class="check"><input type="checkbox" value="${secondCategoryInfo.clsfId}" id="theme-chk${count+1}-${seStatus.index+1}" name="second_category" <c:if test="${fn:contains(searchVO.second_category, secondCategoryInfo.clsfId) }">checked="checked"</c:if>/><label for="theme-chk${count+1}-${seStatus.index+1}">${secondCategoryInfo.clsfNm}(<span>${secondCategoryInfo.cnt}</span>)</label></div></li> <li><div class="check"><input type="checkbox" value="<c:out value='${secondCategoryInfo.clsfId}'/>" id="theme-chk<c:out value='${count+1}'/>-<c:out value='${seStatus.index+1}'/>" name="second_category" <c:if test="${fn:contains(searchVO.second_category, secondCategoryInfo.clsfId) }">checked="checked"</c:if>/><label for="theme-chk<c:out value='${count+1}'/>-<c:out value='${seStatus.index+1}'/>"><c:out value='${secondCategoryInfo.clsfNm}'/>(<span><c:out value='${secondCategoryInfo.cnt}'/></span>)</label></div></li>
</c:if> </c:if>
</c:forEach> </c:forEach>
</ul> </ul>
@ -351,7 +351,7 @@ function fn_search_article(pageIndex) {
<c:forEach var="result" items="${searchVO.orgCountList}" varStatus="status"> <c:forEach var="result" items="${searchVO.orgCountList}" varStatus="status">
<li> <li>
<div class="depth-1"> <div class="depth-1">
<div class="check"><input type="checkbox" id="agency-chk${status.index+1}" value="${result.org_nm}" name="first_agency" <c:if test="${fn:contains(searchVO.filter_agency,result.org_nm)}">checked="checked"</c:if>/><label for="agency-chk${status.index+1}">${result.org_nm}(${result.org_cnt})</label></div> <div class="check"><input type="checkbox" id="agency-chk<c:out value='${status.index+1}'/>" value="<c:out value='${result.org_nm}'/>" name="first_agency" <c:if test="${fn:contains(searchVO.filter_agency,result.org_nm)}">checked="checked"</c:if>/><label for="agency-chk<c:out value='${status.index+1}'/>"><c:out value='${result.org_nm}'/>(<c:out value='${result.org_cnt}'/>)</label></div>
</div> </div>
</li> </li>
</c:forEach> </c:forEach>
@ -432,15 +432,15 @@ function fn_search_article(pageIndex) {
<c:forEach var="result" items="${searchVO.resultList}"> <!-- 리스트 출력 시작 --> <c:forEach var="result" items="${searchVO.resultList}"> <!-- 리스트 출력 시작 -->
<div class="list"> <div class="list">
<div class="t-data"> <div class="t-data">
<div class="img"><a href="javascript:void(0)" onclick="goDetail('${result.masterId}');"><img src="${result.rprsThumbUrlWithDefaultSmall }" alt="${result.title}" width="60" height="91" title="상세보기"></a> <div class="img"><a href="javascript:void(0)" onclick="goDetail('<c:out value='${result.masterId}'/>');"><img src="<c:out value='${result.rprsThumbUrlWithDefaultSmall }'/>" alt="<c:out value='${result.title}'/>" width="60" height="91" title="상세보기"></a>
<c:if test='${result.MUseYn == "Y"}'> <c:if test='${result.MUseYn == "Y"}'>
<button id="favorites_${result.masterId}" class="favorites" onclick="gfn_changeInterest('${result.masterId }', 'off')" title="관심자료에서 삭제합니다."> <button id="favorites_<c:out value='${result.masterId}'/>" class="favorites" onclick="gfn_changeInterest('<c:out value='${result.masterId }'/>', 'off')" title="관심자료에서 삭제합니다.">
<img src="/images/icon/icon-cart-Favorites-on.png" class="off" alt="즐겨찾기 아이콘"> <img src="/images/icon/icon-cart-Favorites-on.png" class="off" alt="즐겨찾기 아이콘">
<img src="/images/icon/icon-cart-Favorites.png" class="on" alt="즐겨찾기 아이콘"> <img src="/images/icon/icon-cart-Favorites.png" class="on" alt="즐겨찾기 아이콘">
</button> </button>
</c:if> </c:if>
<c:if test='${result.MUseYn != "Y"}'> <c:if test='${result.MUseYn != "Y"}'>
<button id="favorites_${result.masterId}" class="favorites" onclick="gfn_changeInterest('${result.masterId }', 'on')" title="관심자료로 등록합니다."> <button id="favorites_<c:out value='${result.masterId}'/>" class="favorites" onclick="gfn_changeInterest('<c:out value='${result.masterId }'/>', 'on')" title="관심자료로 등록합니다.">
<img src="/images/icon/icon-cart-Favorites.png" class="off" alt="즐겨찾기 아이콘"> <img src="/images/icon/icon-cart-Favorites.png" class="off" alt="즐겨찾기 아이콘">
<img src="/images/icon/icon-cart-Favorites-on.png" class="on" alt="즐겨찾기 아이콘"> <img src="/images/icon/icon-cart-Favorites-on.png" class="on" alt="즐겨찾기 아이콘">
</button> </button>
@ -460,13 +460,13 @@ function fn_search_article(pageIndex) {
<span class="etc">기타</span> <span class="etc">기타</span>
</c:if> </c:if>
</div> </div>
<div class="title"><a href="javascript:void(0)" onclick="goDetail('${result.masterId}');"><c:out value="${result.title}"/></a></div> <div class="title"><a href="javascript:void(0)" onclick="goDetail('<c:out value='${result.masterId}'/>');"><c:out value="${result.title}"/></a></div>
<div class="code"><c:out value="${result.mngtNo}"/></div> <div class="code"><c:out value="${result.mngtNo}"/></div>
<div class="subject"> <div class="subject">
<span>자료유형 : <c:if test="${empty result.typeCodeNm and empty result.dtlsTypeDivNm}">-</c:if> ${result.typeCodeNm}<c:if test="${!empty result.typeCodeNm and !empty result.dtlsTypeDivNm}"> &#62; </c:if>${result.dtlsTypeDivNm}</span> <span>자료유형 : <c:if test="${empty result.typeCodeNm and empty result.dtlsTypeDivNm}">-</c:if> <c:out value='${result.typeCodeNm}'/><c:if test="${!empty result.typeCodeNm and !empty result.dtlsTypeDivNm}"> &#62; </c:if><c:out value='${result.dtlsTypeDivNm}'/></span>
<span>주제분야 : <c:if test="${empty result.subjectNmUp and empty result.subjectNm}">-</c:if> ${result.subjectNmUp}<c:if test="${!empty result.subjectNmUp and !empty result.subjectNm}"> &#62; </c:if>${result.subjectNm }</span> <span>주제분야 : <c:if test="${empty result.subjectNmUp and empty result.subjectNm}">-</c:if> <c:out value='${result.subjectNmUp}'/><c:if test="${!empty result.subjectNmUp and !empty result.subjectNm}"> &#62; </c:if><c:out value='${result.subjectNm }'/></span>
<span>생산기관 : <c:if test="${empty result.orgNm }">-</c:if>${result.orgNm }</span> <span>생산기관 : <c:if test="${empty result.orgNm }">-</c:if><c:out value='${result.orgNm }'/></span>
<span>생산년도 : <c:if test="${empty result.creatYyyy }">-</c:if>${result.creatYyyy }</span> <span>생산년도 : <c:if test="${empty result.creatYyyy }">-</c:if><c:out value='${result.creatYyyy }'/></span>
</div> </div>
</div> </div>
<div class="t-btn nomagin"> <div class="t-btn nomagin">
@ -489,9 +489,9 @@ function fn_search_article(pageIndex) {
</c:if> </c:if>
</p> </p>
<c:if test="${result.ableOnline eq true}"> <c:if test="${result.ableOnline eq true}">
<button type="button" class="btn-color" title="새 창 열림" onclick="gfn_showDocPdf('${result.interfaceId}','${result.masterId}','${result.typeDivCd}','${result.dtlsTypeDivCd}')">원문보기</button> <button type="button" class="btn-color" title="새 창 열림" onclick="gfn_showDocPdf('<c:out value='${result.interfaceId}'/>','<c:out value='${result.masterId}'/>','<c:out value='${result.typeDivCd}'/>','<c:out value='${result.dtlsTypeDivCd}'/>')">원문보기</button>
</c:if> </c:if>
<button type="button" class="btn-gray btn-ris" onclick="gfn_showRis('${result.masterId}');">RIS</button> <button type="button" class="btn-gray btn-ris" onclick="gfn_showRis('<c:out value='${result.masterId}'/>');">RIS</button>
</div> </div>
</div> </div>
</c:forEach> <!-- 리스트 출력 끝부분 --> </c:forEach> <!-- 리스트 출력 끝부분 -->

6
src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp
View File

@ -296,7 +296,7 @@ $(document).ready(function() {
<div> <div>
<select id="hopeReqPridDtmFrom" name="hopeReqPridDtmFrom" class="visitDate"> <select id="hopeReqPridDtmFrom" name="hopeReqPridDtmFrom" class="visitDate">
<c:forEach var="dtItem" items="${listDates}" varStatus="status"> <c:forEach var="dtItem" items="${listDates}" varStatus="status">
<option value="${dtItem.dt }">${dtItem.dt }</option> <option value="<c:out value='${dtItem.dt }'/>"><c:out value='${dtItem.dt }'/></option>
</c:forEach> </c:forEach>
</select> 에서 </select> 에서
<label for="hopeReqPridDtmFrom" style="display:none">희망방문 시작일자</label> <label for="hopeReqPridDtmFrom" style="display:none">희망방문 시작일자</label>
@ -304,9 +304,9 @@ $(document).ready(function() {
<div> <div>
<select id="hopeReqPridDtmTo" name="hopeReqPridDtmTo" class="visitDate"> <select id="hopeReqPridDtmTo" name="hopeReqPridDtmTo" class="visitDate">
<c:forEach var="dtItem" items="${listDates}" varStatus="status"> <c:forEach var="dtItem" items="${listDates}" varStatus="status">
<option value="${dtItem.dt }" <option value="<c:out value='${dtItem.dt }'/>"
<c:if test='${status.count == 2}'>selected</c:if> <c:if test='${status.count == 2}'>selected</c:if>
>${dtItem.dt }</option> ><c:out value='${dtItem.dt }'/></option>
</c:forEach> </c:forEach>
</select> 사이 </select> 사이
<label for="hopeReqPridDtmTo" style="display:none">희망방문 종료일자</label> <label for="hopeReqPridDtmTo" style="display:none">희망방문 종료일자</label>

16
src/main/webapp/WEB-INF/jsp/nlib/read/insertReadItems.jsp
View File

@ -99,15 +99,15 @@ function fn_listReadItems() {
<!-- 행 : 시작 --> <!-- 행 : 시작 -->
<div class="list list-content"> <div class="list list-content">
<div class="t-data"> <div class="t-data">
<div class="img"><a href="javascript:void(0)"><img src="${read.rprsThumbUrlWithDefaultSmall }" alt="썸네일" width="60" height="91" title="상세보기" onclick="gfn_getDetail('${read.masterId }')"></a> <div class="img"><a href="javascript:void(0)"><img src="<c:out value='${read.rprsThumbUrlWithDefaultSmall }'/>" alt="썸네일" width="60" height="91" title="상세보기" onclick="gfn_getDetail('<c:out value='${read.masterId }'/>')"></a>
<c:if test='${read.MUseYn == "Y"}'> <c:if test='${read.MUseYn == "Y"}'>
<span id="favorites_${read.masterId}" class="favorites" onclick="gfn_changeInterest('${read.masterId }', 'off')" title="관심자료에서 삭제합니다."> <span id="favorites_<c:out value='${read.masterId}'/>" class="favorites" onclick="gfn_changeInterest('<c:out value='${read.masterId }'/>', 'off')" title="관심자료에서 삭제합니다.">
<img src="/images/icon/icon-cart-Favorites-on.png" class="off" alt="즐겨찾기 아이콘"> <img src="/images/icon/icon-cart-Favorites-on.png" class="off" alt="즐겨찾기 아이콘">
<img src="/images/icon/icon-cart-Favorites.png" class="on" alt="즐겨찾기 아이콘"> <img src="/images/icon/icon-cart-Favorites.png" class="on" alt="즐겨찾기 아이콘">
</span> </span>
</c:if> </c:if>
<c:if test='${read.MUseYn != "Y"}'> <c:if test='${read.MUseYn != "Y"}'>
<span class="favorites" onclick="gfn_changeInterest('${read.masterId }', 'on')" title="관심자료로 등록합니다."> <span class="favorites" onclick="gfn_changeInterest('<c:out value='${read.masterId }'/>', 'on')" title="관심자료로 등록합니다.">
<img src="/images/icon/icon-cart-Favorites.png" class="off" alt="즐겨찾기 아이콘"> <img src="/images/icon/icon-cart-Favorites.png" class="off" alt="즐겨찾기 아이콘">
<img src="/images/icon/icon-cart-Favorites-on.png" class="on" alt="즐겨찾기 아이콘"> <img src="/images/icon/icon-cart-Favorites-on.png" class="on" alt="즐겨찾기 아이콘">
</span> </span>
@ -125,13 +125,13 @@ function fn_listReadItems() {
<span class="visit">방문열람</span> <span class="visit">방문열람</span>
</c:if> </c:if>
</div> </div>
<div class="title"><a href="javascript:void(0)" onclick="gfn_getDetail('${read.masterId }')" title="상세보기">${read.title }</a></div> <div class="title"><a href="javascript:void(0)" onclick="gfn_getDetail('<c:out value='${read.masterId }'/>')" title="상세보기"><c:out value='${read.title }'/></a></div>
</div> </div>
<div class="t-state"><p>${read.useStatusNm }</p></div> <div class="t-state"><p><c:out value='${read.useStatusNm }'/></p></div>
<div class="t-date">${read.rtnExpctDd }</div> <div class="t-date"><c:out value='${read.rtnExpctDd }'/></div>
<div class="t-reser poss">${read.bookLtRvStatusNm } <div class="t-reser poss"><c:out value='${read.bookLtRvStatusNm } '/>
<c:if test='${not empty read.rsrvDd }'> <c:if test='${not empty read.rsrvDd }'>
(${read.rsrvDd }) (<c:out value='${read.rsrvDd }'/>)
</c:if> </c:if>
</div> </div>
</div> </div>

12
src/main/webapp/WEB-INF/jsp/nlib/rent/confirmRent.jsp
View File

@ -223,15 +223,15 @@ $(document).ready(function() {
<div class="list list-content"> <div class="list list-content">
<div class="t-data"> <div class="t-data">
<div class="img"><a href="javascript:void(0)"><img src="${rent.rprsThumbUrlWithDefaultSmall }" alt="썸네일" width="60" height="91" title="상세보기" onclick="gfn_getDetail('${rent.masterId }')"></a> <div class="img"><a href="javascript:void(0)"><img src="<c:out value='${rent.rprsThumbUrlWithDefaultSmall }'/>" alt="썸네일" width="60" height="91" title="상세보기" onclick="gfn_getDetail('<c:out value='${rent.masterId }'/>')"></a>
<c:if test='${rent.MUseYn == "Y"}'> <c:if test='${rent.MUseYn == "Y"}'>
<span id="favorites_${rent.masterId}" class="favorites" onclick="gfn_changeInterest('${rent.masterId }', 'off')" title="관심자료에서 삭제합니다."> <span id="favorites_<c:out value='${rent.masterId}'/>" class="favorites" onclick="gfn_changeInterest('<c:out value='${rent.masterId }'/>', 'off')" title="관심자료에서 삭제합니다.">
<img src="/images/icon/icon-cart-Favorites-on.png" class="off" alt="즐겨찾기 아이콘"> <img src="/images/icon/icon-cart-Favorites-on.png" class="off" alt="즐겨찾기 아이콘">
<img src="/images/icon/icon-cart-Favorites.png" class="on" alt="즐겨찾기 아이콘"> <img src="/images/icon/icon-cart-Favorites.png" class="on" alt="즐겨찾기 아이콘">
</span> </span>
</c:if> </c:if>
<c:if test='${rent.MUseYn != "Y"}'> <c:if test='${rent.MUseYn != "Y"}'>
<span id="favorites_${rent.masterId}" class="favorites" onclick="gfn_changeInterest('${rent.masterId }', 'on')" title="관심자료로 등록합니다."> <span id="favorites_<c:out value='${rent.masterId}'/>" class="favorites" onclick="gfn_changeInterest('<c:out value='${rent.masterId }'/>', 'on')" title="관심자료로 등록합니다.">
<img src="/images/icon/icon-cart-Favorites.png" class="off" alt="즐겨찾기 아이콘"> <img src="/images/icon/icon-cart-Favorites.png" class="off" alt="즐겨찾기 아이콘">
<img src="/images/icon/icon-cart-Favorites-on.png" class="on" alt="즐겨찾기 아이콘"> <img src="/images/icon/icon-cart-Favorites-on.png" class="on" alt="즐겨찾기 아이콘">
</span> </span>
@ -250,10 +250,10 @@ $(document).ready(function() {
<span class="visit">방문열람</span> <span class="visit">방문열람</span>
</c:if> </c:if>
</div> </div>
<div class="title"><a href="javascript:void(0)" onclick="gfn_getDetail('${rent.masterId }')" title="상세보기">${rent.title }</a></div> <div class="title"><a href="javascript:void(0)" onclick="gfn_getDetail('<c:out value='${rent.masterId }'/>')" title="상세보기"><c:out value='${rent.title }'/></a></div>
</div> </div>
<div class="t-state <c:if test="${rent.useStatus != '03' and rent.useStatus != '06' }">poss</c:if> <c:if test="${rent.useStatus == '03' or rent.useStatus == '06' }">imposs</c:if>"><p>${rent.useStatusNm }</p></div> <div class="t-state <c:if test="${rent.useStatus != '03' and rent.useStatus != '06' }">poss</c:if> <c:if test="${rent.useStatus == '03' or rent.useStatus == '06' }">imposs</c:if>"><p><c:out value='${rent.useStatusNm }'/></p></div>
<div class="t-date">${rent.rtnExpctDd }</div> <div class="t-date"><c:out value='${rent.rtnExpctDd }'/></div>
<div class="t-reser <c:if test='${rent.ableRentNow }'>poss</c:if> <c:if test='${!rent.ableRentNow}'>imposs</c:if> "> <div class="t-reser <c:if test='${rent.ableRentNow }'>poss</c:if> <c:if test='${!rent.ableRentNow}'>imposs</c:if> ">
<c:if test='${!rent.ableRentNow}'>신청 불가</c:if> <c:if test='${!rent.ableRentNow}'>신청 불가</c:if>
<c:if test='${rent.ableRentAppNow}'>대출신청</c:if> <c:if test='${rent.ableRentAppNow}'>대출신청</c:if>

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

@ -187,15 +187,15 @@ $(document).ready(function() {
<!-- 행 : 시작 --> <!-- 행 : 시작 -->
<div class="list list-content"> <div class="list list-content">
<div class="t-data"> <div class="t-data">
<div class="img"><a href="javascript:void(0)"><img src="${rent.rprsThumbUrlWithDefaultSmall }" alt="썸네일" width="60" height="91" title="상세보기" onclick="gfn_getDetail('${rent.masterId }')"></a> <div class="img"><a href="javascript:void(0)"><img src="<c:out value='${rent.rprsThumbUrlWithDefaultSmall }'/>" alt="썸네일" width="60" height="91" title="상세보기" onclick="gfn_getDetail('<c:out value='${rent.masterId }'/>')"></a>
<c:if test='${rent.MUseYn == "Y"}'> <c:if test='${rent.MUseYn == "Y"}'>
<span id="favorites_${rent.masterId}" class="favorites" onclick="gfn_changeInterest('${rent.masterId }', 'off')" title="관심자료에서 삭제합니다."> <span id="favorites_<c:out value='${rent.masterId}'/>" class="favorites" onclick="gfn_changeInterest('<c:out value='${rent.masterId }'/>', 'off')" title="관심자료에서 삭제합니다.">
<img src="/images/icon/icon-cart-Favorites-on.png" class="off" alt="즐겨찾기 아이콘"> <img src="/images/icon/icon-cart-Favorites-on.png" class="off" alt="즐겨찾기 아이콘">
<img src="/images/icon/icon-cart-Favorites.png" class="on" alt="즐겨찾기 아이콘"> <img src="/images/icon/icon-cart-Favorites.png" class="on" alt="즐겨찾기 아이콘">
</span> </span>
</c:if> </c:if>
<c:if test='${rent.MUseYn != "Y"}'> <c:if test='${rent.MUseYn != "Y"}'>
<span id="favorites_${rent.masterId}" class="favorites" onclick="gfn_changeInterest('${rent.masterId }', 'on')" title="관심자료로 등록합니다."> <span id="favorites_<c:out value='${rent.masterId}'/>" class="favorites" onclick="gfn_changeInterest('<c:out value='${rent.masterId }'/>', 'on')" title="관심자료로 등록합니다.">
<img src="/images/icon/icon-cart-Favorites.png" class="off" alt="즐겨찾기 아이콘"> <img src="/images/icon/icon-cart-Favorites.png" class="off" alt="즐겨찾기 아이콘">
<img src="/images/icon/icon-cart-Favorites-on.png" class="on" alt="즐겨찾기 아이콘"> <img src="/images/icon/icon-cart-Favorites-on.png" class="on" alt="즐겨찾기 아이콘">
</span> </span>
@ -213,13 +213,13 @@ $(document).ready(function() {
<span class="visit">방문열람</span> <span class="visit">방문열람</span>
</c:if> </c:if>
</div> </div>
<div class="title"><a href="javascript:void(0)" onclick="gfn_getDetail('${rent.masterId }')" title="상세보기">${rent.title }</a></div> <div class="title"><a href="javascript:void(0)" onclick="gfn_getDetail('<c:out value='${rent.masterId }'/>')" title="상세보기"><c:out value='${rent.title }'/></a></div>
</div> </div>
<div class="t-state"><p>${rent.useStatusNm }</p></div> <div class="t-state"><p><c:out value='${rent.useStatusNm }'/></p></div>
<div class="t-date">${rent.rtnExpctDd }</div> <div class="t-date"><c:out value='${rent.rtnExpctDd }'/></div>
<div class="t-reser poss">${rent.rsrvDivNm } <br> <div class="t-reser poss"><c:out value='${rent.rsrvDivNm }'/> <br>
<c:if test='${not empty rent.rsrvDd }'> <c:if test='${not empty rent.rsrvDd }'>
(${rent.rsrvDd }) (<c:out value='${rent.rsrvDd }'/>)
</c:if> </c:if>
</div> </div>
<div class="t-visit long"> <div class="t-visit long">
@ -233,7 +233,7 @@ $(document).ready(function() {
</c:if> </c:if>
<c:if test='${rent.rsrvDivCd != "1" and rent.rsrvDivCd != "2" }'> <c:if test='${rent.rsrvDivCd != "1" and rent.rsrvDivCd != "2" }'>
<c:if test='${not empty rent.resultMessage }'> <c:if test='${not empty rent.resultMessage }'>
${rent.resultMessage } <c:out value='${rent.resultMessage }'/>
</c:if> </c:if>
<c:if test='${empty rent.resultMessage }'> <c:if test='${empty rent.resultMessage }'>
잘못된 접근이거나, 정상처리되지 않았습니다. 잘못된 접근이거나, 정상처리되지 않았습니다.

16
src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp
View File

@ -468,13 +468,13 @@ function detailPopClose(){
<c:forEach var="firstCategoryInfo" items="${firstCategoryList}" varStatus="status"> <c:forEach var="firstCategoryInfo" items="${firstCategoryList}" varStatus="status">
<c:if test="${firstCategoryInfo.upClsfId eq '2' }"> <c:if test="${firstCategoryInfo.upClsfId eq '2' }">
<div class="depth1"> <div class="depth1">
<div class="depth1-check check tab"><input type="checkbox" value="${firstCategoryInfo.clsfId}" id="subject-chk${count+1}" name="first_category"/><label for="subject-chk${count+1}">${firstCategoryInfo.clsfNm}</label> <div class="depth1-check check tab"><input type="checkbox" value="<c:out value='${firstCategoryInfo.clsfId}'/>" id="subject-chk<c:out value='${count+1}'/>" name="first_category"/><label for="subject-chk<c:out value='${count+1}'/>"><c:out value='${firstCategoryInfo.clsfNm}'/></label>
<button type="button" class="tab-name">${firstCategoryInfo.clsfNm}</button> <button type="button" class="tab-name"><c:out value='${firstCategoryInfo.clsfNm}'/></button>
</div> </div>
<ul class="depth2"> <ul class="depth2">
<c:forEach var="secondCategoryInfo" items="${secondCategoryList}" varStatus="seStatus"> <c:forEach var="secondCategoryInfo" items="${secondCategoryList}" varStatus="seStatus">
<c:if test="${firstCategoryInfo.clsfId eq secondCategoryInfo.upClsfId }"> <c:if test="${firstCategoryInfo.clsfId eq secondCategoryInfo.upClsfId }">
<li><div class="check"><input type="checkbox" value="${secondCategoryInfo.clsfId}" id="subject-chk${count+1}-${seStatus.index+1}" name="second_category" /><label for="subject-chk${count+1}-${seStatus.index+1}">${secondCategoryInfo.clsfNm}</label></div></li> <li><div class="check"><input type="checkbox" value="<c:out value='${secondCategoryInfo.clsfId}'/>" id="subject-chk<c:out value='${count+1}'/>-<c:out value='${seStatus.index+1}'/>" name="second_category" /><label for="subject-chk<c:out value='${count+1}'/>-<c:out value='${seStatus.index+1}'/>"><c:out value='${secondCategoryInfo.clsfNm}'/></label></div></li>
</c:if> </c:if>
</c:forEach> </c:forEach>
</ul> </ul>
@ -502,17 +502,17 @@ function detailPopClose(){
<c:forEach var="firstClassList" items="${firstClassList}" varStatus="fcStatus"> <c:forEach var="firstClassList" items="${firstClassList}" varStatus="fcStatus">
<div class="depth1"> <div class="depth1">
<div class="depth1-check check tab"> <div class="depth1-check check tab">
<input type="checkbox" value="${firstClassList.column1}" name="first_class" id="datype-chk${fcStatus.index+1}" /> <input type="checkbox" value="<c:out value='${firstClassList.column1}'/>" name="first_class" id="datype-chk<c:out value='${fcStatus.index+1}'/>" />
<label for="datype-chk${fcStatus.index+1}">${firstClassList.sCodeNm}</label> <label for="datype-chk<c:out value='${fcStatus.index+1}'/>"><c:out value='${firstClassList.sCodeNm}'/></label>
<button type="button" class="tab-name">${firstClassList.sCodeNm}</button> <button type="button" class="tab-name"><c:out value='${firstClassList.sCodeNm}'/></button>
</div> </div>
<ul class="depth2"> <ul class="depth2">
<c:forEach var="secondClassList" items="${secondClassList}" varStatus="seStatus"> <c:forEach var="secondClassList" items="${secondClassList}" varStatus="seStatus">
<c:if test="${firstClassList.column1 eq secondClassList.column2 }"> <c:if test="${firstClassList.column1 eq secondClassList.column2 }">
<li> <li>
<div class="check"> <div class="check">
<input type="checkbox" value="${secondClassList.sCodeId}" name="second_class" id="datype-chk${fcStatus.index+1}-${seStatus.index+1}" /> <input type="checkbox" value="<c:out value='${secondClassList.sCodeId}'/>" name="second_class" id="datype-chk<c:out value='${fcStatus.index+1}'/>-<c:out value='${seStatus.index+1}'/>" />
<label for="datype-chk${fcStatus.index+1}-${seStatus.index+1}">${secondClassList.sCodeNm}</label> <label for="datype-chk<c:out value='${fcStatus.index+1}'/>-<c:out value='${seStatus.index+1}'/>"><c:out value='${secondClassList.sCodeNm}'/></label>
</div> </div>
</li> </li>
</c:if> </c:if>

80
src/main/webapp/WEB-INF/jsp/nlib/userInfo/getMyHome.jsp
View File

@ -135,7 +135,7 @@ $( document ).ready(function() {
<h3>소장자료관 접속현황</h3> <h3>소장자료관 접속현황</h3>
<div class="key-box"> <div class="key-box">
<c:forEach var="itemVisitedOrgs" items="${visitedOrgs }"> <c:forEach var="itemVisitedOrgs" items="${visitedOrgs }">
<a href="javascript:void(0);" title="새 창 열림" onclick="gfn_openNewWindow('https://${itemVisitedOrgs.domainHostNm}.nculture.org')"><span class="button">${itemVisitedOrgs.deptNm }</span></a> <a href="javascript:void(0);" title="새 창 열림" onclick="gfn_openNewWindow('https://<c:out value='${itemVisitedOrgs.domainHostNm}'/>.nculture.org')"><span class="button"><c:out value='${itemVisitedOrgs.deptNm }'/></span></a>
</c:forEach> </c:forEach>
</div> </div>
</div> </div>
@ -157,23 +157,23 @@ $( document ).ready(function() {
<div class="list"> <div class="list">
<div class="thum"> <div class="thum">
<a href="javascript:void(0);" onclick="gfn_getDetail('${item.masterId }')"><img src="${item.rprsThumbUrlWithDefaultSmall }" width="130" height="196" alt="${item.title }"></a> <a href="javascript:void(0);" onclick="gfn_getDetail('<c:out value='${item.masterId }'/>')"><img src="<c:out value='${item.rprsThumbUrlWithDefaultSmall }'/>" width="130" height="196" alt="<c:out value='${item.title }'/>"></a>
</div> </div>
<div class="text"> <div class="text">
<div class="ti"><a href="javascript:void(0);" onclick="gfn_getDetail('${item.masterId }')">${item.title }</a></div> <div class="ti"><a href="javascript:void(0);" onclick="gfn_getDetail('<c:out value='${item.masterId }'/>')"><c:out value='${item.title }'/></a></div>
<div class="cl"> <div class="cl">
<p class="typ"><span>자료유형 :</span><span>${item.typeDivNm } <p class="typ"><span>자료유형 :</span><span><c:out value='${item.typeDivNm }'/>
<c:if test="${not empty item.typeDivNm and not empty item.dtlsTypeDivNm }">&gt;</c:if> ${item.dtlsTypeDivNm } <c:if test="${not empty item.typeDivNm and not empty item.dtlsTypeDivNm }">&gt;</c:if> <c:out value='${item.dtlsTypeDivNm }'/>
<c:if test="${empty item.typeDivNm and empty item.dtlsTypeDivNm }">-</c:if> <c:if test="${empty item.typeDivNm and empty item.dtlsTypeDivNm }">-</c:if>
</span></p> </span></p>
<p class="sub"><span>주제분야 :</span><span>${item.subjectNmUp } <p class="sub"><span>주제분야 :</span><span><c:out value='${item.subjectNmUp } '/>
<c:if test="${not empty item.subjectNmUp and not empty item.subjectNm }">&gt;</c:if> ${item.subjectNm } <c:if test="${not empty item.subjectNmUp and not empty item.subjectNm }">&gt;</c:if> <c:out value='${item.subjectNm }'/>
<c:if test="${empty item.subjectNmUp and empty item.subjectNm }">-</c:if> <c:if test="${empty item.subjectNmUp and empty item.subjectNm }">-</c:if>
</span></p> </span></p>
<p class="age"><span>생산기관 :</span><span>${item.orgNm } <p class="age"><span>생산기관 :</span><span><c:out value='${item.orgNm }'/>
<c:if test="${empty item.orgNm }">-</c:if> <c:if test="${empty item.orgNm }">-</c:if>
</span></p> </span></p>
<p class="yea"><span>생산년도 :</span><span>${item.creatYyyy } <p class="yea"><span>생산년도 :</span><span><c:out value='${item.creatYyyy }'/>
<c:if test="${empty item.creatYyyy }">-</c:if> <c:if test="${empty item.creatYyyy }">-</c:if>
</span></p> </span></p>
</div> </div>
@ -198,32 +198,32 @@ $( document ).ready(function() {
<div class="list-box"> <div class="list-box">
<div class="list"> <div class="list">
<div class="tit"> <div class="tit">
<p>[${item.mngOrgNm }]</p> <p>[<c:out value='${item.mngOrgNm }'/>]</p>
</div> </div>
<div class="con"> <div class="con">
<p><a href="javascript:void(0);" onclick="gfn_getDetail('${item.masterId }')">${item.title }</a></p> <p><a href="javascript:void(0);" onclick="gfn_getDetail('<c:out value='${item.masterId }'/>')"><c:out value='${item.title }'/></a></p>
<p> <p>
<span><em>자료유형 : </em> ${item.typeDivNm } <span><em>자료유형 : </em> <c:out value='${item.typeDivNm }'/>
<c:if test="${not empty item.typeDivNm and not empty item.dtlsTypeDivNm }">&gt;</c:if> ${item.dtlsTypeDivNm } <c:if test="${not empty item.typeDivNm and not empty item.dtlsTypeDivNm }">&gt;</c:if> <c:out value='${item.dtlsTypeDivNm }'/>
<c:if test="${empty item.typeDivNm and empty item.dtlsTypeDivNm }">-</c:if> <c:if test="${empty item.typeDivNm and empty item.dtlsTypeDivNm }">-</c:if>
</span> </span>
<span><em>주제분야 : </em> ${item.subjectNmUp } <span><em>주제분야 : </em> <c:out value='${item.subjectNmUp }'/>
<c:if test="${not empty item.subjectNmUp and not empty item.subjectNm }">&gt;</c:if> ${item.subjectNm } <c:if test="${not empty item.subjectNmUp and not empty item.subjectNm }">&gt;</c:if> <c:out value='${item.subjectNm }'/>
<c:if test="${empty item.subjectNmUp and empty item.subjectNm }">-</c:if> <c:if test="${empty item.subjectNmUp and empty item.subjectNm }">-</c:if>
</span> </span>
<span><em>생산기관 : </em> ${item.orgNm } <c:if test="${empty item.orgNm }">-</c:if></span> <span><em>생산기관 : </em> <c:out value='${item.orgNm }'/> <c:if test="${empty item.orgNm }">-</c:if></span>
<span><em>생산년도 : </em> ${item.creatYyyy } <c:if test="${empty item.creatYyyy }">-</c:if></span> <span><em>생산년도 : </em> <c:out value='${item.creatYyyy }'/> <c:if test="${empty item.creatYyyy }">-</c:if></span>
</p> </p>
</div> </div>
<div class="state"> <div class="state">
<c:if test='${item.bookLtRvStatusCd == "A" }'><span class="subscription">${item.bookLtRvStatusNm}</span></c:if> <c:if test='${item.bookLtRvStatusCd == "A" }'><span class="subscription"><c:out value='${item.bookLtRvStatusNm}'/></span></c:if>
<c:if test='${item.bookLtRvStatusCd == "B" }'><span class="subscription">${item.bookLtRvStatusNm}</span></c:if> <c:if test='${item.bookLtRvStatusCd == "B" }'><span class="subscription"><c:out value='${item.bookLtRvStatusNm}'/></span></c:if>
<c:if test='${item.bookLtRvStatusCd == "C" }'><span class="cancel">${item.bookLtRvStatusNm}</span></c:if> <c:if test='${item.bookLtRvStatusCd == "C" }'><span class="cancel"><c:out value='${item.bookLtRvStatusNm}'/></span></c:if>
<c:if test='${item.bookLtRvStatusCd == "W" }'><span class="loan">${item.bookLtRvStatusNm}</span></c:if> <c:if test='${item.bookLtRvStatusCd == "W" }'><span class="loan"><c:out value='${item.bookLtRvStatusNm}'/></span></c:if>
<c:if test='${item.bookLtRvStatusCd == "R" }'><span class="return">${item.bookLtRvStatusNm}</span></c:if> <c:if test='${item.bookLtRvStatusCd == "R" }'><span class="return"><c:out value='${item.bookLtRvStatusNm}'/></span></c:if>
<c:if test='${item.bookLtRvStatusCd == "R0" }'><span class="return">${item.bookLtRvStatusNm}</span></c:if> <c:if test='${item.bookLtRvStatusCd == "R0" }'><span class="return"><c:out value='${item.bookLtRvStatusNm}'/></span></c:if>
<c:if test='${item.bookLtRvStatusCd == "R1" }'><span class="return">${item.bookLtRvStatusNm}</span></c:if> <c:if test='${item.bookLtRvStatusCd == "R1" }'><span class="return"><c:out value='${item.bookLtRvStatusNm}'/></span></c:if>
<c:if test='${item.bookLtRvStatusCd == "P" }'><span class="overdue">${item.bookLtRvStatusNm}</span></c:if> <c:if test='${item.bookLtRvStatusCd == "P" }'><span class="overdue"><c:out value='${item.bookLtRvStatusNm}'/></span></c:if>
</div> </div>
</div> </div>
</div> </div>
@ -245,31 +245,31 @@ $( document ).ready(function() {
<div class="list-box"> <div class="list-box">
<div class="list"> <div class="list">
<div class="tit"> <div class="tit">
<p>[${item.mngOrgNm }]</p> <p>[<c:out value='${item.mngOrgNm }'/>]</p>
</div> </div>
<div class="con"> <div class="con">
<p><a href="javascript:void(0);" onclick="gfn_getDetail('${item.masterId }')">${item.title }</a></p> <p><a href="javascript:void(0);" onclick="gfn_getDetail('<c:out value='${item.masterId }'/>')"><c:out value='${item.title }'/></a></p>
<p> <p>
<span><em>자료유형 : </em> ${item.typeDivNm } <span><em>자료유형 : </em> <c:out value='${item.typeDivNm }'/>
<c:if test="${not empty item.typeDivNm and not empty item.dtlsTypeDivNm }">&gt;</c:if> ${item.dtlsTypeDivNm } <c:if test="${not empty item.typeDivNm and not empty item.dtlsTypeDivNm }">&gt;</c:if> <c:out value='${item.dtlsTypeDivNm }'/>
<c:if test="${empty item.typeDivNm and empty item.dtlsTypeDivNm }">-</c:if> <c:if test="${empty item.typeDivNm and empty item.dtlsTypeDivNm }">-</c:if>
</span> </span>
<span><em>주제분야 : </em> ${item.subjectNmUp } <span><em>주제분야 : </em> <c:out value='${item.subjectNmUp }'/>
<c:if test="${not empty item.subjectNmUp and not empty item.subjectNm }">&gt;</c:if> ${item.subjectNm } <c:if test="${not empty item.subjectNmUp and not empty item.subjectNm }">&gt;</c:if> <c:out value='${item.subjectNm }'/>
<c:if test="${empty item.subjectNmUp and empty item.subjectNm }">-</c:if> <c:if test="${empty item.subjectNmUp and empty item.subjectNm }">-</c:if>
</span> </span>
<span><em>생산기관 : </em> ${item.orgNm } <c:if test="${empty item.orgNm }">-</c:if></span> <span><em>생산기관 : </em> <c:out value='${item.orgNm }'/> <c:if test="${empty item.orgNm }">-</c:if></span>
<span><em>생산년도 : </em> ${item.creatYyyy } <c:if test="${empty item.creatYyyy }">-</c:if></span> <span><em>생산년도 : </em> <c:out value='${item.creatYyyy }'/> <c:if test="${empty item.creatYyyy }">-</c:if></span>
</p> </p>
</div> </div>
<div class="state"> <div class="state">
<c:if test='${item.reqStatusDivCd == "A0" }'><span class="wait">${item.reqStatusDivNm}</span></c:if> <c:if test='${item.reqStatusDivCd == "A0" }'><span class="wait"><c:out value='${item.reqStatusDivNm}'/></span></c:if>
<c:if test='${item.reqStatusDivCd == "A1" }'><span class="approval">${item.reqStatusDivNm}</span></c:if> <c:if test='${item.reqStatusDivCd == "A1" }'><span class="approval"><c:out value='${item.reqStatusDivNm}'/></span></c:if>
<c:if test='${item.reqStatusDivCd == "W" }'><span class="approval">${item.reqStatusDivNm}</span></c:if> <c:if test='${item.reqStatusDivCd == "W" }'><span class="approval"><c:out value='${item.reqStatusDivNm}'/></span></c:if>
<c:if test='${item.reqStatusDivCd == "A2" }'><span class="return">${item.reqStatusDivNm}</span></c:if> <c:if test='${item.reqStatusDivCd == "A2" }'><span class="return"><c:out value='${item.reqStatusDivNm}'/></span></c:if>
<c:if test='${item.reqStatusDivCd == "C" }'><span class="cancel">${item.reqStatusDivNm}</span></c:if> <c:if test='${item.reqStatusDivCd == "C" }'><span class="cancel"><c:out value='${item.reqStatusDivNm}'/></span></c:if>
<c:if test='${item.reqStatusDivCd == "R" }'><span class="read">${item.reqStatusDivNm}</span></c:if> <c:if test='${item.reqStatusDivCd == "R" }'><span class="read"><c:out value='${item.reqStatusDivNm}'/></span></c:if>
<c:if test='${item.reqStatusDivCd == "D" }'><span class="unread">${item.reqStatusDivNm}</span></c:if> <c:if test='${item.reqStatusDivCd == "D" }'><span class="unread"><c:out value='${item.reqStatusDivNm}'/></span></c:if>
</div> </div>
</div> </div>
</div> </div>

2
src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp
View File

@ -736,7 +736,7 @@ function snsUnlink(snsId){
<div class="row"> <div class="row">
<c:forEach var="result" items="${snsList}" varStatus="status"> <c:forEach var="result" items="${snsList}" varStatus="status">
<div class="list" id="sns_<c:out value="${result.mbSnsId}"/>"> <div class="list" id="sns_<c:out value="${result.mbSnsId}"/>">
<div class="sns-box ${fn:toLowerCase(result.snsType)}"><span><img src="/images/icon/icon-${fn:toLowerCase(result.snsType)}-login.png" alt="로고"></span><span><c:out value="${result.snsUserId}" /> <c:out value="${result.regDd}" /> 연결완료</span></div> <div class="sns-box <c:out value='${fn:toLowerCase(result.snsType)}'/>"><span><img src="/images/icon/icon-<c:out value='${fn:toLowerCase(result.snsType)}'/>-login.png" alt="로고"></span><span><c:out value="${result.snsUserId}" /> <c:out value="${result.regDd}" /> 연결완료</span></div>
<c:if test="${fn:length(snsList) > 1}"><button type="button" class="btn-black" name="unlinkBtn" onclick="snsUnlink('<c:out value="${result.mbSnsId}" />');">연결해제</button></c:if> <c:if test="${fn:length(snsList) > 1}"><button type="button" class="btn-black" name="unlinkBtn" onclick="snsUnlink('<c:out value="${result.mbSnsId}" />');">연결해제</button></c:if>
</div> </div>
</c:forEach> </c:forEach>

21
src/main/webapp/js/fileupload/dropzone.js
View File

@ -112,15 +112,20 @@
dropzone.on("dragEnter", function() { }); dropzone.on("dragEnter", function() { });
*/ */
Dropzone.prototype.events = ["drop", "dragstart", "dragend", "dragenter", "dragover", "dragleave", "addedfile", "addedfiles", "removedfile", "thumbnail", "error", "errormultiple", "processing", "processingmultiple", "uploadprogress", "totaluploadprogress", "sending", "sendingmultiple", "success", "successmultiple", "canceled", "canceledmultiple", "complete", "completemultiple", "reset", "maxfilesexceeded", "maxfilesreached", "queuecomplete"]; Dropzone.prototype.events = ["drop", "dragstart", "dragend", "dragenter", "dragover", "dragleave"
, "addedfile", "addedfiles", "removedfile", "thumbnail", "error", "errormultiple"
, "processing", "processingmultiple", "uploadprogress", "totaluploadprogress"
, "sending", "sendingmultiple", "success", "successmultiple", "canceled", "canceledmultiple"
, "complete", "completemultiple", "reset", "maxfilesexceeded", "maxfilesreached", "queuecomplete"];
Dropzone.prototype.defaultOptions = { Dropzone.prototype.defaultOptions = {
url: null, url: null,
method: "post", method: "post",
withCredentials: false, withCredentials: false,
parallelUploads: 5, parallelUploads: 3,
uploadMultiple: false, uploadMultiple: false,
maxFilesize: 256, // maxFilesize: 256, // NLIB
maxFilesize: 10, // NLIB : 10MB
paramName: "file", paramName: "file",
createImageThumbnails: true, createImageThumbnails: true,
maxThumbnailFilesize: 10, maxThumbnailFilesize: 10,
@ -129,7 +134,7 @@
thumbnailHeight: 60, // NLIB thumbnailHeight: 60, // NLIB
filesizeBase: 1000, filesizeBase: 1000,
//maxFiles: null, //maxFiles: null,
maxFiles: 3, // NLIB : 최대 업로드 가능한 파일수 maxFiles: 5, // NLIB : 최대 업로드 가능한 파일수
params: {}, params: {},
clickable: true, clickable: true,
ignoreHiddenFiles: true, ignoreHiddenFiles: true,
@ -147,7 +152,7 @@
//dictFallbackMessage: "Your browser does not support drag'n'drop file uploads.", //dictFallbackMessage: "Your browser does not support drag'n'drop file uploads.",
dictFallbackMessage: "파일 드래그앤드랍을 지원하지 않는 브라우저입니다.", // NLIB dictFallbackMessage: "파일 드래그앤드랍을 지원하지 않는 브라우저입니다.", // NLIB
dictFallbackText: "Please use the fallback form below to upload your files like in the olden days.", dictFallbackText: "Please use the fallback form below to upload your files like in the olden days.",
dictFileTooBig: "파일이 너무 큽니다({{filesize}}MiB). 최대 크기 {{maxFilesize}}MiB를 넘을 수 없습니다.", // "File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.", dictFileTooBig: "파일이 너무 큽니다({{filesize}}MB). \n최대 크기 {{maxFilesize}}MB를 초과할 수 없습니다.", // "File is too big ({{filesize}}MiB). Max filesize: {{maxFilesize}}MiB.",
//dictInvalidFileType: "You can't upload files of this type.", //dictInvalidFileType: "You can't upload files of this type.",
dictInvalidFileType: "허용된 파일 형식만 첨부가능합니다 (이미지,문서 파일) ", // NLIB dictInvalidFileType: "허용된 파일 형식만 첨부가능합니다 (이미지,문서 파일) ", // NLIB
dictResponseError: "Server responded with {{statusCode}} code.", dictResponseError: "Server responded with {{statusCode}} code.",
@ -157,7 +162,7 @@
dictRemoveFile: "취소", // NLIB dictRemoveFile: "취소", // NLIB
dictRemoveFileConfirmation: null, dictRemoveFileConfirmation: null,
//dictMaxFilesExceeded: "You can not upload any more files.", //dictMaxFilesExceeded: "You can not upload any more files.",
dictMaxFilesExceeded: "이파일은, 첨부 가능 최대 개수를 초과하여 업로드되지 않습니다.", // NLIB dictMaxFilesExceeded: "최대 첨부할 수 있는 파일은 {{maxFiles}}개 입니다.", // NLIB
accept: function(file, done) { accept: function(file, done) {
return done(); return done();
}, },
@ -284,9 +289,7 @@
node = _ref1[_j]; node = _ref1[_j];
node.title = '이미 등록된 파일입니다. 클릭하여 다운로드할 수 있습니다.'; node.title = '이미 등록된 파일입니다. 클릭하여 다운로드할 수 있습니다.';
$(node).css("cursor", "pointer"); $(node).css("cursor", "pointer");
$(node).on("click", function() { $(node).attr("onclick", "fn_downloadFile('" + file.attachFileId + "', " + file.fileSn + ")");
fn_downloadFile(file.attachFileId, file.fileSn);
});
} }
} }