Index: base3.10/src/main/java/egovframework/com/cop/bbs/web/EgovArticleController.java =================================================================== --- base3.10/src/main/java/egovframework/com/cop/bbs/web/EgovArticleController.java (revision 83) +++ base3.10/src/main/java/egovframework/com/cop/bbs/web/EgovArticleController.java (revision 84) @@ -249,6 +249,7 @@ } ////-------------------------- + model.addAttribute("userId", user.getUniqId()); model.addAttribute("boardMasterVO", masterVo); return ".defaultSubLayout/com/cop/bbs/EgovArticleDetail"; 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 83) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleList.jsp (revision 84) @@ -113,7 +113,7 @@ </a> <c:if test="${noticeInfo.commentCo != ''}"> <div class="count_comment"> - <span class="icon-say"></span><c:out value='[${noticeInfo.commentCo}]'/> + <span class="icon-say"></span><c:out value='${noticeInfo.commentCo}'/> </div> </c:if> </td> @@ -134,19 +134,6 @@ <p><c:out value="${(searchVO.pageIndex-1) * searchVO.pageSize + status.count}"/></p> </td> <c:choose> - <c:when test="${resultInfo.sjBoldAt == 'Y'}"> - <!-- 제목 Bold인 경우 --> - <td class="board_tit"> - <a href="#!" onclick="fn_egov_inquire_articledetail('${resultInfo.bbsId }', '${resultInfo.nttId }');" title="${resultInfo.nttSj }"> - <c:out value='${fn:substring(resultInfo.nttSj, 0, 40)}'/> - </a> - <c:if test="${resultInfo.commentCo != ''}"> - <div class="count_comment"> - <span class="icon-say"></span><c:out value='[${resultInfo.commentCo}]'/> - </div> - </c:if> - </td> - </c:when> <c:when test="${resultInfo.secretAt == 'Y' && sessionUniqId != resultInfo.frstRegisterId}"> <!-- 비밀글이며 작성자가 본인이 아닌 경우(클릭 불가) --> <td class="board_tit"> @@ -158,7 +145,7 @@ <span class="icon-lock"></span><c:out value='${fn:substring(resultInfo.nttSj, 0, 40)}'/> <c:if test="${resultInfo.commentCo != ''}"> <div class="count_comment"><span class="icon-say"></span> - <c:out value='[${resultInfo.commentCo}]'/> + <c:out value='${resultInfo.commentCo}'/> </div> </c:if> </td> 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 83) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleUpdt.jsp (revision 84) @@ -73,13 +73,8 @@ return false; } else { var validateForm = document.getElementById("articleVO"); - //비밀글은 제목 진하게 할 수 없음. //비밀글은 공지게시 불가. if(validateForm.secretAt.checked) { - if(validateForm.sjBoldAt.checked) { - alert("<spring:message code="comCopBbs.articleVO.secretBold" />"); - return; - } if(validateForm.noticeAt.checked) { alert("<spring:message code="comCopBbs.articleVO.secretNotice" />"); return; 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 83) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleReply.jsp (revision 84) @@ -149,16 +149,11 @@ <input name="file_1" 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> - <input name="file_1" 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="inputFile" title="업로드 할 파일을 선택해주세요">파일업로드</label> </div> - <em class="exp filenote">※ 파일당 10MB까지 첨부 가능합니다.</em> - <ul class="file_list" id="egovComFileList" style="display:none;"> + <em class="exp filenote">※ 파일당 ${boardMasterVO.atchPosblFileSize }MB까지 첨부 가능합니다.</em> + <ul class="file_list" id="egovComFileList"> </ul> - <em class="exp filenote">※ 파일당 ${boardMasterVO.atchPosblFileSize }MB까지 첨부 가능합니다.</em> - <div class="file_list" id="egovComFileList"></div> </div> </li> </c:if> Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleDetail.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleDetail.jsp (revision 83) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleDetail.jsp (revision 84) @@ -159,28 +159,30 @@ </div> <div class="right"> <c:if test="${result.ntcrId != 'anonymous'}"> - <!-- 익명글 수정/삭제 불가 --> - <form name="articleForm" action="<c:url value='/cop/bbs/updateArticleView.do'/>" method="post" > - <button type="submit" class="btn_l bg_basic" value="<spring:message code="button.update" />" title="<spring:message code="title.update" />" ><spring:message code="button.update" /></button><!-- 수정 --> - <input type="hidden" name="parnts" value="<c:out value='${result.parnts}'/>" > - <input type="hidden" name="sortOrdr" value="<c:out value='${result.sortOrdr}'/>" > - <input type="hidden" name="replyLc" value="<c:out value='${result.replyLc}'/>" > - <input type="hidden" name="nttSj" value="<c:out value='${result.nttSj}'/>" > - <input name="nttId" type="hidden" value="<c:out value="${result.nttId}" />"> - <input name="bbsId" type="hidden" value="<c:out value="${boardMasterVO.bbsId}" />"> - </form> - <form name="formDelete" action="<c:url value='/cop/bbs/${reBbsId }/deleteArticle.do'/>" > - <button type="submit" class="btn_l bg_basic" value="<spring:message code="button.delete" />" title="<spring:message code="button.delete" />" onclick="fn_egov_delete_article(this.form); return false;" ><spring:message code="button.delete" /></button><!-- 삭제 --> - <input name="nttId" type="hidden" value="<c:out value="${result.nttId}" />"> - <input name="bbsId" type="hidden" value="<c:out value="${boardMasterVO.bbsId}" />"> - </form> + <!-- 익명글 수정/삭제 불가 --> + <form name="articleForm" action="<c:url value='/cop/bbs/updateArticleView.do'/>" method="post" > + <button type="submit" class="btn_l bg_basic" value="<spring:message code="button.update" />" title="<spring:message code="title.update" />" ><spring:message code="button.update" /></button><!-- 수정 --> + <input type="hidden" name="parnts" value="<c:out value='${result.parnts}'/>" > + <input type="hidden" name="sortOrdr" value="<c:out value='${result.sortOrdr}'/>" > + <input type="hidden" name="replyLc" value="<c:out value='${result.replyLc}'/>" > + <input type="hidden" name="nttSj" value="<c:out value='${result.nttSj}'/>" > + <input name="nttId" type="hidden" value="<c:out value="${result.nttId}" />"> + <input name="bbsId" type="hidden" value="<c:out value="${boardMasterVO.bbsId}" />"> + </form> + <c:if test="${userId eq boardMasterVO.frstRegisterId }"> + <form name="formDelete" action="<c:url value='/cop/bbs/${reBbsId }/deleteArticle.do'/>" > + <button type="submit" class="btn_l bg_basic" value="<spring:message code="button.delete" />" title="<spring:message code="button.delete" />" onclick="fn_egov_delete_article(this.form); return false;" ><spring:message code="button.delete" /></button><!-- 삭제 --> + <input name="nttId" type="hidden" value="<c:out value="${result.nttId}" />"> + <input name="bbsId" type="hidden" value="<c:out value="${boardMasterVO.bbsId}" />"> + </form> + </c:if> </c:if> <c:if test="${boardMasterVO.replyPosblAt == 'Y' }"> - <form name="formReply" action="<c:url value='/cop/bbs/${reBbsId }/replyArticleView.do'/>" method="post" > - <button type="submit" class="btn_l bg_basic" value="<spring:message code="button.reply" />" title="<spring:message code="button.reply" />"><spring:message code="button.reply" /></button><!-- 답글 --> - <input name="nttId" type="hidden" value="<c:out value="${result.nttId}" />"> - <input name="bbsId" type="hidden" value="<c:out value="${boardMasterVO.bbsId}" />"> - </form> + <form name="formReply" action="<c:url value='/cop/bbs/${reBbsId }/replyArticleView.do'/>" method="post" > + <button type="submit" class="btn_l bg_basic" value="<spring:message code="button.reply" />" title="<spring:message code="button.reply" />"><spring:message code="button.reply" /></button><!-- 답글 --> + <input name="nttId" type="hidden" value="<c:out value="${result.nttId}" />"> + <input name="bbsId" type="hidden" value="<c:out value="${boardMasterVO.bbsId}" />"> + </form> </c:if> </div> </div> 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 83) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleRegist.jsp (revision 84) @@ -172,7 +172,7 @@ <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> - <em class="exp filenote">※ 파일당 10MB까지 첨부 가능합니다.</em> + <em class="exp filenote">※ 파일당 ${boardMasterVO.atchPosblFileSize }MB까지 첨부 가능합니다.</em> <ul class="file_list" id="egovComFileList"> </ul> </div>