Commit @103 - jhleem/egov

Files
Commit

이다솜 2022-02-18 @103

[20220218 이다솜] 게시판 수정코밋

Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleList.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleList.jsp (revision 102) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleList.jsp (revision 103) @@ -131,7 +131,7 @@ <c:forEach items="${resultList}" var="resultInfo" varStatus="status"> <tr> <td class="board_num"> - <p><c:out value="${(searchVO.pageIndex-1) * searchVO.pageSize + status.count}"/></p> + <p><c:out value="${paginationInfo.totalRecordCount - ((paginationInfo.currentPageNo-1) * paginationInfo.recordCountPerPage + status.index)}"/></p> </td> <c:choose> <c:when test="${resultInfo.secretAt == 'Y' && sessionUniqId != resultInfo.frstRegisterId}"> Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleUpdt.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleUpdt.jsp (revision 102) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleUpdt.jsp (revision 103) @@ -72,14 +72,14 @@ if (!validateArticleVO(form)) { return false; } else { - var validateForm = document.getElementById("articleVO"); +// var validateForm = document.getElementById("articleVO"); //비밀글은 공지게시 불가. - if(validateForm.secretAt.checked) { + /* if(validateForm.secretAt.checked) { if(validateForm.noticeAt.checked) { alert("<spring:message code="comCopBbs.articleVO.secretNotice" />"); return; } - } + } */ if (confirm("<spring:message code="common.update.msg" />")) { form.submit(); @@ -131,7 +131,7 @@ </div> </li>  - <c:set var="title"><spring:message code="comCopBbs.articleVO.updt.noticeAt" /></c:set> + <%-- <c:set var="title"><spring:message code="comCopBbs.articleVO.updt.noticeAt" /></c:set> <li> <strong class="title"><label for="noticeAt">${title}</label></strong> <div class="checkbox"> @@ -140,9 +140,9 @@ <div><form:errors path="noticeAt" cssClass="error" /></div> </div> </div> - </li> + </li> --%>  - <c:set var="title"><spring:message code="comCopBbs.articleVO.updt.secretAt" /></c:set> + <%-- <c:set var="title"><spring:message code="comCopBbs.articleVO.updt.secretAt" /></c:set> <li> <strong class="title"><label for="secretAt">${title}</label></strong> <div class="input_wrap"> @@ -159,13 +159,27 @@ </div> </div> </div> - </li> + </li> --%> + <c:if test="${boardMasterVO.bbsTyCode == 'BBST02'}"> + <li> + <strong class="title">대표첨부파일선택</strong> + <div class="input_wrap file_up"> + <div> + <input name="file_1" id="egovComRprsFileUploader" type="file" class="blind userUpload" title="대표첨부파일선택" multiple/> + <input type="hidden" id="rprsAtchFileId" name="rprsAtchFileId" value="${articleVO.rprsAtchFileId}" /> + <label for="egovComRprsFileUploader" class="btn_m bg_basic btn_file_up" title="업로드 할 파일을 선택해주세요">파일업로드<span class="icon-file-up"></span></label> + </div> + <em class="exp filenote">※ 파일당 ${boardMasterVO.atchPosblFileSize }MB까지 첨부 가능합니다.</em> + <div class="file_img" id="egovComRprsFileList" style="display:none;"></div> + </div> + </li> + </c:if> <c:if test="${boardMasterVO.fileAtchPosblAt == 'Y'}"> <li> <strong class="title">첨부파일</strong> <div class="input_wrap file_up"> <div> - <input name="file_1" id="egovComFileUploader" type="file" class="blind userUpload" title="<spring:message code="comCopBbs.articleVO.regist.atchFile"/>" multiple/> + <input name="file_2" id="egovComFileUploader" type="file" class="blind userUpload" title="<spring:message code="comCopBbs.articleVO.regist.atchFile"/>" multiple/> <input type="hidden" id="atchFileId" name="atchFileId" value="${articleVO.atchFileId}" /> <label for="egovComFileUploader" class="btn_m bg_basic btn_file_up" title="업로드 할 파일을 선택해주세요">파일업로드<span class="icon-file-up"></span></label> </div> @@ -209,8 +223,34 @@ } $('#nttCn').initEditor(options); + // 파일업로드 + $(function() { + var options = { + fileListDivId : 'egovComRprsFileList', + inputFileId : 'egovComRprsFileUploader', + hiddenFileName : 'rprsAtchFileId', + progress : 'progress', + maxSize : 1, // 첨부파일 등록개수 + fileAllowedTypes: ['png', 'jpg', 'jpeg'], // 확장자 체크 ['png', 'pdf'] + fileMaxSize: 10 // 첨부파일 사이즈 + } + var defaultsDom = function(html) { + var fileIcon = fileExtIcon(html.fileExtsn); + var fileSize = fileSizeConvert(html.fileSize); + + var dom = '<li id=' + html.fileId + '>'; + dom += '<img alt="배너 이미지" src="' + html.link + '">'; + dom += '<div class="btn">'; + dom += '<a class="btn_sq_s btn_delete" href="javascript:void(0)" title="삭제"><span class="blind">삭제</span></a>'; + dom += '<a class="btn_sq_s btn_filedown" href="' + html.link + '" title="다운로드"><span class="blind">다운로드</span></a>'; + dom += '</div>'; + dom += '</li>'; + return dom; + } + $.initFileUpload(options, defaultsDom); + }); /* 비밀글 설정시 비밀번호입력창 show */ - var $pwDiv = $('#pwDiv'); + /* var $pwDiv = $('#pwDiv'); $pwDiv.hide(function() { if ($pwDiv.hasClass('blind')) { $pwDiv.removeClass('blind'); @@ -225,7 +265,7 @@ } else { $pwDiv.hide(); } - }); + }); */ }); </script> Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleReply.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleReply.jsp (revision 102) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleReply.jsp (revision 103) @@ -72,14 +72,14 @@ if (!validateArticleVO(form)) { return false; } else { - var validateForm = document.getElementById("articleVO"); +// var validateForm = document.getElementById("articleVO"); //익명글은 공지게시 불가. - if(validateForm.anonymousAt.checked) { + /* if(validateForm.anonymousAt.checked) { if(validateForm.noticeAt.checked) { alert("<spring:message code="comCopBbs.articleVO.anonymousNotice" />"); return; } - } + } */ if(confirm("<spring:message code="common.regist.msg" />")) { form.submit(); @@ -129,7 +129,7 @@ </div> </li>  - <c:set var="title"><spring:message code="comCopBbs.articleVO.regist.noticeAt"/> </c:set> + <%-- <c:set var="title"><spring:message code="comCopBbs.articleVO.regist.noticeAt"/> </c:set> <li><strong class="title">${title}</strong> <div class="input_wrap"> <div class="checkbox"> @@ -139,7 +139,24 @@ </div> </div> </div> - </li> + </li> --%> + + <c:if test="${boardMasterVO.bbsTyCode == 'BBST02'}"> + <tr> + <th scope="col"><label for="egovComRprsFileUploader">대표첨부파일선택</label></th> + <td class="nopd"> + <div class="space5"></div> + <div class="file_up"> + <label for="egovComRprsFileUploader" class="inputFile" title="업로드 할 파일을 선택해주세요">파일업로드</label> + <input type="file" id="egovComRprsFileUploader" name="file_1" title="대표첨부파일 선택" /> +  + <input type="hidden" id="rprsAtchFileId" name="rprsAtchFileId" value="" /> + </div> + <em class="exp filenote">※ 파일당 ${boardMasterVO.atchPosblFileSize }MB까지 첨부 가능합니다.</em> + <ul id="egovComRprsFileList" class="file_img" style="display: none;"></ul> + </td> + </tr> + </c:if> <c:if test="${boardMasterVO.fileAtchPosblAt == 'Y'}"> <li> @@ -204,8 +221,36 @@ } $('#nttCn').initEditor(options); + // 파일업로드 + $(function() { + var options = { + fileListDivId : 'egovComRprsFileList', + inputFileId : 'egovComRprsFileUploader', + hiddenFileName : 'rprsAtchFileId', + progress : 'progress', + maxSize : 1, // 첨부파일 등록개수 + fileAllowedTypes: ['png', 'jpg', 'jpeg'], // 확장자 체크 ['png', 'pdf'] + fileMaxSize: 10 // 첨부파일 사이즈 + } + var defaultsDom = function(html) { + var fileIcon = fileExtIcon(html.fileExtsn); + var fileSize = fileSizeConvert(html.fileSize); + + var dom = '<li id=' + html.fileId + '>'; + dom += '<img alt="배너 이미지" src="' + html.link + '">'; + dom += '<div class="btn">'; + dom += '<a class="btn_sq_s btn_delete" href="javascript:void(0)" title="삭제"><span class="blind">삭제</span></a>'; + dom += '<a class="btn_sq_s btn_filedown" href="' + html.link + '" title="다운로드"><span class="blind">다운로드</span></a>'; + dom += '</div>'; + dom += '</li>'; + return dom; + } + + $.initFileUpload(options, defaultsDom); + }); + /* 비밀글 설정시 비밀번호입력창 show */ - var $pwDiv = $('#pwDiv'); + /* var $pwDiv = $('#pwDiv'); $pwDiv.hide(function() { if ($pwDiv.hasClass('blind')) { $pwDiv.removeClass('blind'); @@ -220,7 +265,7 @@ } else { $pwDiv.hide(); } - }); + }); */ }); </script> Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleRegist.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleRegist.jsp (revision 102) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleRegist.jsp (revision 103) @@ -114,6 +114,9 @@ <form:form commandName="articleVO" action="${pageContext.request.contextPath}/cop/bbs/${reBbsId }/insertArticle.do" method="post" onSubmit="fn_egov_regist_article(document.forms[0]); return false;" enctype="multipart/form-data"> <div class="inner"> + <div class="caption alignR"> + <p class="must"><em>*</em> 는 필수항목입니다</p> + </div> <div class="board_write"> <ul>  @@ -184,7 +187,7 @@ <strong class="title">첨부파일</strong> <div class="input_wrap file_up"> <div> - <input name="file_1" id="egovComFileUploader" type="file" class="blind userUpload" title="<spring:message code="comCopBbs.articleVO.regist.atchFile"/>" multiple/> + <input name="file_2" id="egovComFileUploader" type="file" class="blind userUpload" title="<spring:message code="comCopBbs.articleVO.regist.atchFile"/>" multiple/> <input type="hidden" id="atchFileId" name="atchFileId" value="" /> <label for="egovComFileUploader" class="btn_m bg_basic btn_file_up" title="업로드 할 파일을 선택해주세요">파일업로드<span class="icon-file-up"></span></label> </div>

Add a comment

List

Delete comment