jhleem / egov star

한선우 한선우 2022-02-21 @119


            
Index: base3.10/src/main/webapp/css/user/popup.css =================================================================== --- base3.10/src/main/webapp/css/user/popup.css (revision 118) +++ base3.10/src/main/webapp/css/user/popup.css (revision 119) @@ -32,7 +32,7 @@ .wrap-layer-popup.search_popup > .inner-layer-popup { width:100%; border-radius:0; } .int_search { display:block; width:100%; } .int_search .inner { width:1000px; padding:30px 0; } -.int_search .search_wrap { border-bottom:2px solid #333; position:relative; } +.int_search .search_wrap { float:none; border-bottom:2px solid #333; position:relative; } .int_search .search_wrap .inputText { height:60px; float:left; width:calc(100% - 60px); border:none; border-radius:0; font-size:1.5em; font-weight:600; } .int_search .search_wrap .inputText:hover { box-shadow:none; } .int_search .search_wrap .btn_search { width:60px; height:60px; border-radius:0 !important; border:none; font-size:2em; color:#727272; transition:all 0.3s; } Index: base3.10/src/main/webapp/css/admin/style.css =================================================================== --- base3.10/src/main/webapp/css/admin/style.css (revision 118) +++ base3.10/src/main/webapp/css/admin/style.css (revision 119) @@ -221,11 +221,12 @@ /*file 디자인****************************************************************************************************************************************/ /*첨부파일*/ -.file_up { position:relative; } +.file_up { position:relative; display:flex; align-items:center;} .file_up input[type="file"] { position: absolute; left:0; top:0; width:120px; height:35px; border-radius:5px; padding:0; margin:0; border:0; z-index:0; } .file_up label {border:1px solid #ccc; padding:10px; width:120px; text-align:center; height:35px; padding:6px 10px 0 !important; background:#fff; border-radius:2px; position:relative; z-index:1; box-shadow:none; display:inline-block; transition:0.3s ease-in-out; } .file_up label:hover { box-shadow:0 0 5px 0 rgba(0,0,0,0.3); border-color:#666; } .file_up label.btn_fileup span { margin-left:10px; } +.file_up .exp.filenote { margin-top:0; margin-left:10px; } /*일반파일*/ .file_list { margin:10px -2px -2px; display:inline-block; display: -webkit-box; display: -webkit-flex; display: -moz-box; display: -ms-flexbox; display:flex; align-items:flex-start; flex-direction:column; flex-direction:row; flex-wrap:wrap; } @@ -248,13 +249,16 @@ /*이미지파일*/ .file_list.img_type { margin:10px -2px -2px; } -.file_list.img_type .file_box { display:flex; align-items:center; padding:5px 7px 5px 15px; border:1px solid #ccc; width:130px; height:130px; border-radius:10px; margin:2px; transition:all .2s ease-in-out; position:relative; overflow:hidden; } +.file_list.img_type .file_box { display:flex; align-items:center; padding:5px 7px 5px 15px; border:1px solid #ccc; width:110px; height:110px; border-radius:10px; margin:2px; transition:all .2s ease-in-out; position:relative; overflow:hidden; } .file_list.img_type .btn_wrap { position:absolute; background:rgba(0,0,0,0.5); backdrop-filter:blur(10px); bottom:-100%; left:0; width:100%; text-align:center; padding:5px 0;transition:all .2s ease-in-out; } .file_list.img_type .file_box:hover { box-shadow:0 0 10px 0 rgba(0,0,0,0.1); border-color:#666; } .file_list.img_type .file_box:hover .btn_wrap { bottom:0; } .file_list.img_type .file_box .btn_wrap button { color:#fff; margin:0 3px;border-radius:2px; } .file_list.img_type .file_box .btn_wrap button:hover { color:#6cb4ff; } +.file_list.thumb_type .file_box { position:relative; padding:5px 7px 5px 5px; } +.file_list.thumb_type .thumbnail { width:25px; height:25px; border-radius:5px; margin-right:10px;} +.file_list.thumb_type .file_name em { margin-left:5px; font-size:0.8em; } .btn_inner { width:24px; height:24px; background:transparent; border:none; padding:0; color:#333; font-size:1em; border-radius:50px; } .btn_inner:hover { box-shadow:none; border:none; color:#1d69db; } Index: base3.10/src/main/webapp/css/admin/board.css =================================================================== --- base3.10/src/main/webapp/css/admin/board.css (revision 118) +++ base3.10/src/main/webapp/css/admin/board.css (revision 119) @@ -33,6 +33,12 @@ .exp.filenote { font-size:0.9em; margin-top:10px; display:inline-block; } .table_list th .check2, .table_list td .check2 { display:inline-block; } +.thumbnail { width:80px; height:80px; border-radius:10px; display:inline-block; position:relative; cursor:pointer; transition:all 0.3s; } +.thumbnail:hover { box-shadow:0 0 15px 0 rgba(0,0,0,0.8); } +.thumbnail .thumb_zoom { position:fixed; border-radius:20px; opacity:0; pointer-events:none; z-index:9; } +.thumbnail .thumb_zoom img { width:auto; height:250px; display:inline-block; border-radius:20px; border:5px solid #fff; box-shadow:0 0 20px 0 rgba(0,0,0,0.3); } +.thumbnail:hover .thumb_zoom { opacity:1; transition:opacity 0.3s; } + /*게시판write style1*/ .table_write { width:100%; font-size:14px; border-top:2px solid #224173; border-collapse:initial; table-layout:fixed;} .table_write th { background:#f6f8ff; color:#224173; border-bottom:1px solid #d5dfff; text-align:center; padding:13px 0; font-weight:600; box-sizing:border-box; vertical-align:middle; } Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cmm/fms/EgovFileList.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cmm/fms/EgovFileList.jsp (revision 118) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cmm/fms/EgovFileList.jsp (revision 119) @@ -8,7 +8,7 @@ <c:if test="${not empty resultList }"> <div class="board_file"> - <ul class="file_list"> + <div class="file_list"> <c:forEach var="item" items="${resultList }"> <c:choose> <c:when test="${item.fileSize / 1024 > 1024 }"> @@ -80,7 +80,7 @@ <c:choose> <c:when test="${authorType eq 'user'}"> - <li class="file_box"> + <div class="file_box"> <!--<a href="${item.link}" title="파일 다운로드"> --> <p class="file_name"> @@ -89,10 +89,10 @@ <!--</a>--> <button onClick="location.href='${item.link }'" class="btn_inner" title="<c:out value="${item.originFileNm}" /> 다운받기"><span class="icon-file-down"></span><em class="blind">첨부파일다운로드</em></button> - </li> + </div> </c:when> <c:otherwise> - <li class="${fileIcon} file_box"> + <div class="${fileIcon} file_box"> <p class="file_name"> <em class="blind">첨부파일명</em><c:out value="${item.originFileNm}" /> @@ -100,7 +100,7 @@ <%-- <em><fmt:formatNumber value="${fileSize}" pattern="0.00" />${fileUnit}</em> --%> <button onclick="location.href='${item.link}'" class="btn_inner" title="<c:out value="${item.originFileNm}" /> 다운받기"><span class="icon-file-down"></span><em class="blind">첨부파일다운로드</em></button> <%-- <a href="${item.link}"><button type="button" class="btn_inner" title="<c:out value="${item.originFileNm}" /> 다운받기">다운</button></a> --%> - </li> + </div> </c:otherwise> </c:choose> @@ -108,6 +108,6 @@ </a> <em><fmt:formatNumber value="${fileSize }" pattern=".0" />${fileUnit }</em> <!-- <button class="btn_s bgcolor01">삭제</button> <button class="btn_s bgcolor01">다운로드 본문에 넣기</button> --></li>--%> </c:forEach> - </ul> + </div> </div> </c:if> \ No newline at end of file Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cmm/fms/EgovImgFileList.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cmm/fms/EgovImgFileList.jsp (revision 118) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cmm/fms/EgovImgFileList.jsp (revision 119) @@ -7,83 +7,93 @@ <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <c:if test="${not empty resultList }"> - <c:forEach var="item" items="${resultList }"> - <c:choose> - <c:when test="${item.fileSize / 1024 > 1024 }"> - <c:set var="fileSize" value="${item.fileSize / (1024 * 1024) }" /> - <c:set var="fileUnit" value="MB" /> - </c:when> - <c:otherwise> - <c:set var="fileSize" value="${item.fileSize / 1024 }" /> - <c:set var="fileUnit" value="KB" /> - </c:otherwise> - </c:choose> - <c:set var="fileIcon" value="file_reg" /> - <c:choose> - <c:when test="${item.fileExtsn eq 'pdf'}"> - <c:set var="fileIcon" value="file_pdf" /> - </c:when> - <c:when test="${item.fileExtsn eq 'ppt'}"> - <c:set var="fileIcon" value="file_ppt" /> - </c:when> - <c:when test="${item.fileExtsn eq 'pptx'}"> - <c:set var="fileIcon" value="file_ppt" /> - </c:when> - <c:when test="${item.fileExtsn eq 'xls'}"> - <c:set var="fileIcon" value="file_excel" /> - </c:when> - <c:when test="${item.fileExtsn eq 'xlsx'}"> - <c:set var="fileIcon" value="file_excel" /> - </c:when> - <c:when test="${item.fileExtsn eq 'doc'}"> - <c:set var="fileIcon" value="file_word" /> - </c:when> - <c:when test="${item.fileExtsn eq 'docx'}"> - <c:set var="fileIcon" value="file_word" /> - </c:when> - <c:when test="${item.fileExtsn eq 'hwp'}"> - <c:set var="fileIcon" value="file_word" /> - </c:when> - <c:when test="${item.fileExtsn eq 'png'}"> - <c:set var="fileIcon" value="file_img" /> - </c:when> - <c:when test="${item.fileExtsn eq 'jpg'}"> - <c:set var="fileIcon" value="file_img" /> - </c:when> - <c:when test="${item.fileExtsn eq 'jpeg'}"> - <c:set var="fileIcon" value="file_img" /> - </c:when> - <c:when test="${item.fileExtsn eq 'gif'}"> - <c:set var="fileIcon" value="file_img" /> - </c:when> - <c:when test="${item.fileExtsn eq 'bmp'}"> - <c:set var="fileIcon" value="file_img" /> - </c:when> - <c:when test="${item.fileExtsn eq 'tiff'}"> - <c:set var="fileIcon" value="file_img" /> - </c:when> - <c:when test="${item.fileExtsn eq 'tif'}"> - <c:set var="fileIcon" value="file_img" /> - </c:when> - <c:when test="${item.fileExtsn eq 'zip'}"> - <c:set var="fileIcon" value="file_zip" /> - </c:when> - <c:when test="${item.fileExtsn eq '7z'}"> - <c:set var="fileIcon" value="file_zip" /> - </c:when> - <c:otherwise> - <c:set var="fileIcon" value="file_reg" /> - </c:otherwise> - </c:choose> -<!-- <li> --> -<%-- <a href="#!" onclick="fncImageChange('${item.fileId }');"> --%> - ${item.originFileNm }<br/> -<!-- </a> --> -<%-- <em><fmt:formatNumber value="${fileSize }" pattern="0.00" />${fileUnit }</em> --%> - <!-- <button class="btn_s bgcolor01">삭제</button> - <button class="btn_s bgcolor01">다운로드 본문에 넣기</button> --> -<!-- </li> --> - </c:forEach> + <div class="file_list thumb_type"> + <c:forEach var="item" items="${resultList }"> + <c:choose> + <c:when test="${item.fileSize / 1024 > 1024 }"> + <c:set var="fileSize" value="${item.fileSize / (1024 * 1024) }" /> + <c:set var="fileUnit" value="MB" /> + </c:when> + <c:otherwise> + <c:set var="fileSize" value="${item.fileSize / 1024 }" /> + <c:set var="fileUnit" value="KB" /> + </c:otherwise> + </c:choose> + <c:set var="fileIcon" value="file_reg" /> + <c:choose> + <c:when test="${item.fileExtsn eq 'pdf'}"> + <c:set var="fileIcon" value="file_pdf" /> + </c:when> + <c:when test="${item.fileExtsn eq 'ppt'}"> + <c:set var="fileIcon" value="file_ppt" /> + </c:when> + <c:when test="${item.fileExtsn eq 'pptx'}"> + <c:set var="fileIcon" value="file_ppt" /> + </c:when> + <c:when test="${item.fileExtsn eq 'xls'}"> + <c:set var="fileIcon" value="file_excel" /> + </c:when> + <c:when test="${item.fileExtsn eq 'xlsx'}"> + <c:set var="fileIcon" value="file_excel" /> + </c:when> + <c:when test="${item.fileExtsn eq 'doc'}"> + <c:set var="fileIcon" value="file_word" /> + </c:when> + <c:when test="${item.fileExtsn eq 'docx'}"> + <c:set var="fileIcon" value="file_word" /> + </c:when> + <c:when test="${item.fileExtsn eq 'hwp'}"> + <c:set var="fileIcon" value="file_word" /> + </c:when> + <c:when test="${item.fileExtsn eq 'png'}"> + <c:set var="fileIcon" value="file_img" /> + </c:when> + <c:when test="${item.fileExtsn eq 'jpg'}"> + <c:set var="fileIcon" value="file_img" /> + </c:when> + <c:when test="${item.fileExtsn eq 'jpeg'}"> + <c:set var="fileIcon" value="file_img" /> + </c:when> + <c:when test="${item.fileExtsn eq 'gif'}"> + <c:set var="fileIcon" value="file_img" /> + </c:when> + <c:when test="${item.fileExtsn eq 'bmp'}"> + <c:set var="fileIcon" value="file_img" /> + </c:when> + <c:when test="${item.fileExtsn eq 'tiff'}"> + <c:set var="fileIcon" value="file_img" /> + </c:when> + <c:when test="${item.fileExtsn eq 'tif'}"> + <c:set var="fileIcon" value="file_img" /> + </c:when> + <c:when test="${item.fileExtsn eq 'zip'}"> + <c:set var="fileIcon" value="file_zip" /> + </c:when> + <c:when test="${item.fileExtsn eq '7z'}"> + <c:set var="fileIcon" value="file_zip" /> + </c:when> + <c:otherwise> + <c:set var="fileIcon" value="file_reg" /> + </c:otherwise> + </c:choose> + <div class="file_box"> + <div class="thumbnail bg_box"> + <img src="/images/user/main_bg.jpg" alt=""> + <div class="thumb_zoom"><img src="/images/user/main_bg.jpg" alt=""></div> + </div> + <p class="file_name">${item.originFileNm } <%-- <em><fmt:formatNumber value="${fileSize }" pattern="0.00" />${fileUnit }</em> --%></p> + <button onclick="location.href='#!'" class="btn_inner" title=""><span class="icon-file-down"></span><em class="blind">첨부파일다운로드</em></button> + </div> + + <!-- <li> --> + <%-- <a href="#!" onclick="fncImageChange('${item.fileId }');"> --%> + <!-- </a> --> + <%-- <em><fmt:formatNumber value="${fileSize }" pattern="0.00" />${fileUnit }</em> --%> + <!-- <button class="btn_s bgcolor01">삭제</button> + <button class="btn_s bgcolor01">다운로드 본문에 넣기</button> --> + <!-- </li> --> + </c:forEach> + </div> </c:if> <script> // 이미지 변경 Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleManageRegist.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleManageRegist.jsp (revision 118) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleManageRegist.jsp (revision 119) @@ -189,8 +189,9 @@ <input type="file" id="egovComRprsFileUploader" name="file_1" title="대표첨부파일 선택" /> <!-- 첨부파일 --> <input type="hidden" id="rprsAtchFileId" name="rprsAtchFileId" value="" /> + <em class="exp filenote">※ 파일당 ${boardMasterVO.atchPosblFileSize }MB까지 첨부 가능합니다.</em> </div> - <em class="exp filenote">※ 파일당 ${boardMasterVO.atchPosblFileSize }MB까지 첨부 가능합니다.</em> + <div id="egovComRprsFileList" class="file_list img_type" style="display: none;"></div> </td> </tr> @@ -208,8 +209,9 @@ <input type="file" id="egovComFileUploader" name="file_2" title="<spring:message code="comCopBbs.articleVO.regist.atchFile"/>" /> <!-- 첨부파일 --> <input type="hidden" id="atchFileId" name="atchFileId" value="" /> + <em class="exp filenote">※ 파일당 ${boardMasterVO.atchPosblFileSize }MB까지 첨부 가능합니다.</em> </div> - <em class="exp filenote">※ 파일당 ${boardMasterVO.atchPosblFileSize }MB까지 첨부 가능합니다.</em> + <div id="egovComFileList" class="file_list addFileSize" style="display: none;"></div> </td> </tr> @@ -279,11 +281,11 @@ var dom = '<div id=' + html.fileId + ' class="file_box bg_box" style="background-image:url(' + html.link + ');">'; dom += '<img alt="배너 이미지" src="' + html.link + '">'; - dom += '<div class="btn">'; - dom += '<button type="button" class="btn_sq_s btn_delete" onclick="javascript:void(0)" title="삭제"><span class="blind">삭제</span></button>'; - dom += '<button type="button" class="btn_sq_s btn_filedown" href="' + html.link + '" onclick="location.replace(' + "'" + html.link + "'" + ');" title="다운로드"><span class="blind">다운로드</span></button>'; + dom += '<div class="btn_wrap">'; + dom += '<button type="button" class="btn_inner" onclick="javascript:void(0)" title="삭제"><span class="icon-delete"></span><em class="blind">삭제</em></button>'; + dom += '<button type="button" class="btn_inner" href="' + html.link + '" onclick="location.replace(' + "'" + html.link + "'" + ');" title="다운로드"><span class="icon-file-down"></span><em class="blind">다운로드</em></button>'; dom += '</div>'; - dom += '</li>'; + dom += '</div>'; return dom; } Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleManageList.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleManageList.jsp (revision 118) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleManageList.jsp (revision 119) @@ -145,7 +145,7 @@ <tr class="notice"> <td>공지</td> <td class="alignL"> - <a href="#!" onclick="fn_egov_inquire_articledetail(${reBbsId},${noticeInfo.nttId});">${noticeInfo.nttSj} <c:if test="${noticeInfo.commentCo != ''}"> [${noticeInfo.commentCo}]</c:if></a> + <a href="#!" title="${noticeInfo.nttSj} <c:if test="${noticeInfo.commentCo != ''}"> [${noticeInfo.commentCo}]</c:if>" onclick="fn_egov_inquire_articledetail(${reBbsId},${noticeInfo.nttId});">${noticeInfo.nttSj} <c:if test="${noticeInfo.commentCo != ''}"> [${noticeInfo.commentCo}]</c:if></a> </td> <td>${noticeInfo.frstRegisterNm}</td> <td>${noticeInfo.frstRegisterPnttm}</td> @@ -160,7 +160,7 @@ </td> <!-- 나머지 경우 --> <td class="alignL <c:if test="${resultInfo.secretAt == 'Y'}">secret</c:if>"> - <a href="#!" onclick="fn_egov_inquire_articledetail(${reBbsId},${resultInfo.nttId});">${resultInfo.nttSj} <c:if test="${resultInfo.commentCo != ''}">[${resultInfo.commentCo}]</c:if></a> + <a href="#!" title="${resultInfo.nttSj} <c:if test="${resultInfo.commentCo != ''}">[${resultInfo.commentCo}]</c:if>" onclick="fn_egov_inquire_articledetail(${reBbsId},${resultInfo.nttId});">${resultInfo.nttSj} <c:if test="${resultInfo.commentCo != ''}">[${resultInfo.commentCo}]</c:if></a> <c:if test="${resultInfo.secretAt eq 'Y'}"> <em class="icon_secret">비밀글</em> </c:if> @@ -172,6 +172,54 @@ </c:forEach> </tbody> </table> + + <!-- img list --> + <div class="space50"></div> + <table class="table_list"> + <caption>게시판 목록 - 번호, 글제목, 등록자, 작성시각, 조회수로 구성</caption> + <colgroup> + <col class="width100"> + <col class="width100"> + <col class="widthauto"> + <col class="width150"> + <col class="width150"> + <col class="width100"> + </colgroup> + <thead> + <tr> + <th scope="col"><spring:message code="table.num" /></th><!-- 번호 --> + <th scope="col">썸네일</th><!-- 이미지 --> + <th scope="col" class="board_th_link"><spring:message code="comCopBbs.articleVO.list.nttSj" /></th><!--글 제목 --> + <th scope="col"><spring:message code="table.reger" /></th><!-- 작성자명 --> + <th scope="col"><spring:message code="table.regdate" /></th><!-- 작성시각 --> + <th scope="col"><spring:message code="comCopBbs.articleVO.list.inqireCo" /></th><!-- 조회수 --> + </tr> + </thead> + <tbody class="ov"> + <!-- 게시글 본문 --> + + <tr> + <td>2</td> + <td class="alignC"><div class="thumbnail bg_box"><img src="/images/user/main_bg.jpg" alt=""><div class="thumb_zoom"><img src="/images/user/main_bg.jpg" alt=""></div></div></td> + <!-- 나머지 경우 --> + <td class="alignL"><a href="#!" onclick="">ㅎㅎㅎ</a></td> + <td>웹마스터1</td> + <td>2022-02-18</td> + <td>110</td> + </tr> + <tr> + <td>1</td> + <td class="alignC"><div class="thumbnail bg_box"><img src="/images/user/sample_writer.jpg" alt=""><div class="thumb_zoom"><img src="/images/user/sample_writer.jpg" alt=""></div></div></td> + <!-- 나머지 경우 --> + <td class="alignL"><a href="#!" onclick="">ㅎㅎㅎ</a></td> + <td>웹마스터1</td> + <td>2022-02-18</td> + <td>110</td> + </tr> + </tbody> + </table> + <!-- img list --> + </div> <div class="board_footer"> <!-- paging navigation --> @@ -187,5 +235,4 @@ <input name="bbsId" type="hidden" value="${boardMasterVO.bbsId}"> <input name="nttId" type="hidden" value="0"> <input name="pageIndex" type="hidden" value="${searchVO.pageIndex}" > -</form> - +</form> \ No newline at end of file Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleManageUpdt.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleManageUpdt.jsp (revision 118) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleManageUpdt.jsp (revision 119) @@ -183,8 +183,8 @@ <input type="file" id="egovComRprsFileUploader" name="file_1" title="<spring:message code="comCopBbs.articleVO.regist.atchFile"/>" /> <!-- 첨부파일 --> <input type="hidden" id="rprsAtchFileId" name="rprsAtchFileId" value="${articleVO.rprsAtchFileId}" /> + <em class="exp filenote">※ 파일당 ${boardMasterVO.atchPosblFileSize }MB까지 첨부 가능합니다.</em> </div> - <em class="exp filenote">※ 파일당 ${boardMasterVO.atchPosblFileSize }MB까지 첨부 가능합니다.</em> <div id="egovComRprsFileList" class="file_list img_type" style="display: none;"></div> </td> </tr> @@ -203,8 +203,8 @@ <input type="file" id="egovComFileUploader" name="file_2" title="<spring:message code="comCopBbs.articleVO.regist.atchFile"/>" /> <!-- 첨부파일 --> <input type="hidden" id="atchFileId" name="atchFileId" value="${articleVO.atchFileId}" /> + <em class="exp filenote">※ 파일당 ${boardMasterVO.atchPosblFileSize }MB까지 첨부 가능합니다.</em> </div> - <em class="exp filenote">※ 파일당 ${boardMasterVO.atchPosblFileSize }MB까지 첨부 가능합니다.</em> <div id="egovComFileList" class="file_list" style="display: none;"></div> </td> </tr> 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 118) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleReply.jsp (revision 119) @@ -153,7 +153,7 @@ <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> + <div id="egovComRprsFileList" class="file_img" style="display: none;"></div> </td> </tr> </c:if> @@ -169,8 +169,8 @@ <!-- 첨부파일 --> </div> <em class="exp filenote">※ 파일당 ${boardMasterVO.atchPosblFileSize }MB까지 첨부 가능합니다.</em> - <ul class="file_list" id="egovComFileList" style="display:none;"> - </ul> + <div class="file_list" id="egovComFileList" style="display:none;"> + </div> </div> </li> </c:if> @@ -236,13 +236,13 @@ 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>'; + var dom = '<div class="file_box bo_box" id=' + html.fileId + '>'; + dom += '<img alt="첨부파일 이미지" src="' + html.link + '">'; + dom += '<div class="btn_wrap">'; + dom += '<button type="button" class="btn_inner" title="삭제"><span class="icon-delete"></span><em class="blind">삭제</em></button>'; + dom += '<button type="button" class="btn_inner" onClick="location.href=' + html.link + '" title="다운로드"><span class="icon-file-down"></span><em class="blind">다운로드</em></button>'; dom += '</div>'; - dom += '</li>'; + dom += '</div>'; return dom; } Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/uss/ion/bnr/EgovBannerRegist.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/uss/ion/bnr/EgovBannerRegist.jsp (revision 118) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/uss/ion/bnr/EgovBannerRegist.jsp (revision 119) @@ -80,13 +80,13 @@ var fileIcon = fileExtIcon(html.fileExtsn); var fileSize = fileSizeConvert(html.fileSize); - var dom = '<li id=' + html.fileId + '>'; + var dom = '<div class="file_box bg_box" id=' + html.fileId + ' style="background-image:url(' + html.link + ');">'; 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 class="btn_wrap">'; + dom += '<button type="button" class="btn_inner" onclick="javascript:void(0)" title="삭제"><span class="icon-delete"></span><em class="blind">삭제</em></button>'; + dom += '<button type="button" class="btn_inner" href="' + html.link + '" onclick="location.replace(' + "'" + html.link + "'" + ');" title="다운로드"><span class="icon-file-down"></span><em class="blind">다운로드</em></button>'; dom += '</div>'; - dom += '</li>'; + dom += '</div>'; return dom; } @@ -131,12 +131,12 @@ <label for="egovComFileUploader" class="btn_fileup">파일업로드<span class="icon-file-up"></span></label> <input class="upload-name blind" disabled="disabled"> <input type="file" name="file_1" id="egovComFileUploader" title="<spring:message code="comUssIonBnr.bannerVO.bannerImage"/>"> + <em class="exp filenote">※ 파일당 10MB까지 첨부 가능합니다.</em> </div> - <em class="exp filenote">※ 파일당 10MB까지 첨부 가능합니다.</em> <div id="progress" class="progress mt-3" style="display: none;"> <div class="progress-bar" style="width: 0%;">0%</div> </div> - <ul class="file_img" id="bannerFileList" style="display:none;"></ul> + <ul class="file_list img_type" id="bannerFileList" style="display:none;"></ul> </td> </tr> <tr> Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/uss/ion/bnr/EgovBannerUpdt.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/uss/ion/bnr/EgovBannerUpdt.jsp (revision 118) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/uss/ion/bnr/EgovBannerUpdt.jsp (revision 119) @@ -120,12 +120,12 @@ <label for="egovComFileUploader" class="btn_fileup">파일업로드<span class="icon-file-up"></span></label> <input class="upload-name blind" disabled="disabled"> <input type="file" name="file_1" id="egovComFileUploader" title="<spring:message code="comUssIonBnr.bannerVO.bannerImage"/>"> + <em class="exp filenote">※ 파일당 10MB까지 첨부 가능합니다.</em> </div> - <em class="exp filenote">※ 파일당 10MB까지 첨부 가능합니다.</em> <div id="progress" class="progress mt-3" style="display: none;"> <div class="progress-bar" style="width: 0%;">0%</div> </div> - <ul class="file_list img_type" id="bannerFileList" style="display:none;"></ul> + <div class="file_list img_type" id="bannerFileList" style="display:none;"></div> </td> </tr> <tr> Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/site/SystemManage.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/site/SystemManage.jsp (revision 118) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/site/SystemManage.jsp (revision 119) @@ -196,8 +196,8 @@ <label for="logo" class="btn_fileup">파일업로드<span class="icon-file-up"></span></label> <input class="upload-name blind" disabled="disabled"> <input type="file" id="logo" class="upload-hidden"> + <em class="exp filenote">※ 파일당 10MB까지 첨부 가능합니다.</em> </div> - <em class="exp filenote">※ 파일당 10MB까지 첨부 가능합니다.</em> <div id="progress" class="progress mt-3" style="display: none;"> <div class="progress-bar" style="width: 0%;">0%</div> </div> @@ -212,8 +212,8 @@ <label for="favicon" class="btn_fileup">파일업로드<span class="icon-file-up"></span></label> <input class="upload-name blind" > <input type="file" id="favicon" class="upload-hidden"/> + <em class="exp filenote">※ 파일당 10MB까지 첨부 가능합니다.</em> </div> - <em class="exp filenote">※ 파일당 10MB까지 첨부 가능합니다.</em> <div id="progress" class="progress mt-3" style="display: none;"> <div class="progress-bar" style="width: 0%;">0%</div> </div> Index: base3.10/src/main/webapp/WEB-INF/jsp/index.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/index.jsp (revision 118) +++ base3.10/src/main/webapp/WEB-INF/jsp/index.jsp (revision 119) @@ -179,13 +179,13 @@ var controller = new ScrollMagic.Controller(); // build tween var tween = TweenMax.to(".main_slide", 0.5, {opacity: "0"}), - height = $(".main_slide").outerHeight() / 2; + height = $(".main_slide").outerHeight() / 2; var wave = TweenMax.to(".bg_wave", 0.5, {opacity: "1"}), - waveHeight = $(".bg_wave").outerHeight(); + waveHeight = $(".bg_wave").outerHeight(); // slide - var scene = new ScrollMagic.Scene({triggerElement: ".main_slide", triggerHook:'0'}) - .duration(height) + var scene = new ScrollMagic.Scene({triggerElement: ".main_slide", triggerHook:'.2'}) + .duration("45%") .offset(height) .setTween(tween) //.addIndicators({name: "main_slide"}) Index: base3.10/src/main/webapp/js/admin/designJS.js =================================================================== --- base3.10/src/main/webapp/js/admin/designJS.js (revision 118) +++ base3.10/src/main/webapp/js/admin/designJS.js (revision 119) @@ -19,9 +19,21 @@ 'notice' : function(){ if ($(".table_list tbody tr").hasClass('notice')){ $(this).addClass("noticeY"); - } - } + } + }, + + + 'thumb' : function(){ + $(document).mousemove(function(e){ + var mouseX = e.pageX; + var mouseY = e.pageY; + $('.thumb_zoom').css({ + left: mouseX + "px", + top : mouseY + "px" + }) + }) } +} var gnb = { 'submenu' : function(){ @@ -293,6 +305,7 @@ board.overY() //글이 긴 경우 더보기 board.notice() //공지사항 글이 있을 경우 + board.thumb() //썸네일 확대 gnb.submenu() acodian.click();
Add a comment
List