Commit @73 - jhleem/egov

Files
Commit

한선우 2022-02-16 @73

Index: base3.10/src/main/webapp/css/user/common.css =================================================================== --- base3.10/src/main/webapp/css/user/common.css (revision 72) +++ base3.10/src/main/webapp/css/user/common.css (revision 73) @@ -12,11 +12,13 @@ .header h1 a img { display:none; } .header ul { display:flex; } .header ul li { } -.header ul li a { color:#777; font-size:0.9em; position:relative;transition:all 0.3s; } -.header ul li a:hover { color:#333; } +.header ul li a, +.header ul li p { color:#777; font-size:0.9em; position:relative;transition:all 0.3s; display:inline-block; } +.header ul li a:hover, +.header ul li p:hover { color:#333; } .header ul li a::before { content:''; width:0; height:1px; background:#333; display:inline-block; transition:all 0.3s; position:absolute; bottom:0; left:50%; transform:translateX(-50%); } .header ul li a:hover::before { width:100%; } -.header ul li::after { content:''; width:2px; height:2px; background:#333; display:inline-block; border-radius:5px; margin:0 13px 3px; } +.header ul li::after { content:''; width:2px; height:2px; background:#333; display:inline-block; border-radius:5px; margin:0 10px 3px; } .header ul li:last-child::after { display:none; } .header_list { width:100%; display:flex; justify-content:space-between; } .header .header_bottom { float:right; margin-top:15px; display:flex; } @@ -29,12 +31,13 @@ .main_container { width:100%; height:100%; } .main_container .header { position:absolute; top:0; left:0; background:transparent; color:#fff; transition:background 0.5s; border-bottom:1px solid rgba(255,255,255,.2); box-shadow:none; } .main_container .header h1 a { background:url(/images/user/logo_fff.svg) 50% 50% no-repeat; background-size:contain; } -.main_container .header ul li a { color:#fff; } +.main_container .header ul li a, .main_container .header ul li p { color:#fff; } .main_container .header ul li::after { background:#fff;} .main_container .header .info { color:#fff; border:1px solid #fff;} .main_container .header:hover { background-color:rgba(255,255,255,1); backdrop-filter:blur(10px); } .main_container .header:hover h1 a { background:url(/images/user/logo.svg) 50% 50% no-repeat; background-size:contain; } -.main_container .header:hover ul li a { color:#727272; } +.main_container .header:hover ul li a, +.main_container .header:hover ul li p { color:#727272; } .main_container .header:hover ul li a:hover { color:#333; } .main_container .header:hover ul li::after { background:#333;} .main_container .header:hover .info { color:#333; border:1px solid #333;} Index: base3.10/src/main/webapp/css/user/font.css =================================================================== --- base3.10/src/main/webapp/css/user/font.css (revision 72) +++ base3.10/src/main/webapp/css/user/font.css (revision 73) @@ -118,6 +118,12 @@ .icon-pencil:before { content: "\e917"; } +.icon-forward:before { + content: "\e969"; +} +.icon-cog:before { + content: "\e994"; +} .icon-arrow-thin-u:before { content: "\ea3a"; } Index: base3.10/src/main/webapp/css/user/style.css =================================================================== --- base3.10/src/main/webapp/css/user/style.css (revision 72) +++ base3.10/src/main/webapp/css/user/style.css (revision 73) @@ -140,7 +140,8 @@ /* bgcolor */ .bg_gray {background-color:#f4f5f7 !important;} /* 결제대기 */ -.bg_lightgray {background-color:#f8f8f8 !important;} +.bg_lightgray {background-color:#f8f8f8 !important;transition:all 0.3s;} +.bg_lightgray:hover {background-color:#f0f0f0 !important;} .bg_white {background-color:#fff !important; color:#333; border:1px solid #ccc;} .bg_white:hover { border:1px solid #666; } .bg_navy { background:#143b84; color:#fff; border-color:#0d3071; transition:all 0.3s; } @@ -224,6 +225,7 @@ .btn_inner { width:24px; height:24px; background:transparent; border-color:transparent; padding:0; color:#999; font-size:1em; border-radius:50px; } .btn_inner:hover { box-shadow:none; color:#333; } .btn_inner .icon-file-down { } +.btn_inner.widthauto { font-size:0.8em; } /*select 디자인****************************************************************************************************************************************/ select { padding-left:5px; padding-right:25px !important; background:url(/images/user/arrow_bottom.svg) calc(100% - 10px) 50% no-repeat #fff; background-size:10px; cursor:pointer;transition:all .5s ease-in-out; overflow:hidden !important; text-overflow: ellipsis; white-space:nowrap; Index: base3.10/src/main/webapp/css/user/board.css =================================================================== --- base3.10/src/main/webapp/css/user/board.css (revision 72) +++ base3.10/src/main/webapp/css/user/board.css (revision 73) @@ -8,9 +8,14 @@ .board_list th { padding:20px 0; border-bottom:1px solid #333; } .board_list td { padding:25px 0; border-bottom:1px solid #ededed; } .board_list th, .board_list td { transition:all 0.3s; vertical-align:middle; text-align:center; } -.board_list td a { width:100%; display:block; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; font-weight:600;} -.board_list td.board_tit { text-align:left; } +.board_list td a { max-width:calc(100% - 100px); display:inline-block; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; font-weight:600;} +.board_list td.board_tit { text-align:left; display:flex; } .board_list .board_num strong { font-weight:600; color:#1524cc; } +.board_list .notice td { background:#f9f9f9; } +.board_list .notice td em { padding:2px 8px; line-height:1em; background: #0032c3; color:#fff; font-size:0.9em; border-radius:5px; } +.board_list .count_comment { border:1px solid #ccc; box-shadow:0 0 10px 0 rgba(0,0,0,0.1); background:#fff; font-size:0.9em; margin-left:8px; padding:5px 7px; line-height:1em; border-radius:50px; display:inline-block; } +.board_list .count_comment span { margin-right:5px; display:inline-block; } +.board_list td.board_tit.bold input { background:none; border:none; } /*basic view*/ .board_header { border-top:2px solid #333;border-bottom:1px solid #ededed; padding:25px 0; } @@ -22,7 +27,15 @@ .board_header .by p a { display:inline-block; position:relative; } .board_header .by p em { color:#666; margin-right:5px; font-weight:400; } .board_header .by p:last-child::after { display:none; } -.board_content { padding:50px 0; border-bottom:1px solid #ededed; } +.board_content { padding:60px 0; border-bottom:1px solid #ededed; } +.board_content .fr-file { padding:5px 15px; border:1px solid #ccc; border-radius:5px; margin:2px; background-color:#fff; transition:all .2s ease-in-out; } +.board_content .fr-file::after { content:""; width:12px; height:12px; margin-left:10px; background:url(/images/user/icon-file-down.svg) 50% 50% no-repeat; background-size:contain; display:inline-block; } +.board_content .fr-file:hover { box-shadow:0 0 10px 0 rgba(0,0,0,0.1); border-color:#666; } +.board_file { padding:10px; margin:30px 0 0; border:1px solid #f1f1f1; background:#fafafa; border-radius:5px; } +.board_file .file_list .file_box { display:flex; width:auto; align-items:center; padding:5px 7px 5px 15px; border:1px solid #ccc; border-radius:5px; margin:2px; background-color:#fff; transition:all .2s ease-in-out; } +.board_file .file_list .file_box:hover { box-shadow:0 0 10px 0 rgba(0,0,0,0.1); border-color:#666; } +.board_file .file_list .file_box p { display:inline-block; min-width:100px; max-width:300px; font-size:0.9em; letter-spacint:-0.5em; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; padding-right:20px; position:relative; } +.board_file .file_list .file_box p::after { width:1px; height:15px; content:''; display:inline-block; background:#ccc; position:absolute; top:5px; right:6px; } /*basic write*/ .board_write { width:100%; border-top:2px solid #333; } @@ -33,6 +46,7 @@ .board_write ul > li .input_wrap { margin-bottom:5px; } .board_write ul > li .input_wrap:last-child { margin-bottom:0; } .board_write ul > li .input_option { margin-top:15px; } +.board_write ul > li .exp.filenote { margin:10px 0 0; } .caption { display:block; margin-bottom:20px; } .caption .must { font-weight:600; color:#555; } @@ -59,7 +73,7 @@ .pagination li { box-sizing:border-box; position:relative; cursor:pointer; display:inline-block; margin:0 5px; } .pagination li a { display:inline-block; cursor:pointer; border-radius:50px; width:30px; height:30px; line-height:30px; color:#333; font-size:1em; transition:background-color 0.3s;} .pagination li a:hover { background-color:#ededed; } -.pagination li.active a { font-weight:bold; color:#fff; background:#333; } +.pagination li.active a { font-weight:bold; background:#ededed; } .pagination .first, .pagination .last, .pagination .next, .pagination .prev { margin:0 2px; } .bottom_wrap .pagination { position:absolute; left:50%; transform:translateX(-50%); display:inline-block; } @@ -74,25 +88,25 @@ .text_show.active label { opacity:0; } /*댓글*/ -.reply_wrap { padding:30px 0 20px; transition:all 0.3s; border-bottom:1px solid #ededed; } -.reply_wrap .title { padding:20px; display:flex; position:relative; align-items:center; border:1px solid #ccc; border-radius:5px !important; } +.reply_wrap { padding:30px 0; transition:all 0.3s; border-bottom:1px solid #ededed; } +.reply_wrap .title { padding-bottom:15px; display:flex; position:relative; align-items:center; } .reply_wrap .title strong { font-size:1.3em; font-weight:900; display:inline-block; line-height:1em; } -.reply_wrap .title strong em { font-size:13px; font-weight:400; border:1px solid #ccc; border-radius:30px; line-height:1em; padding:5px 10px; margin-left:2px; transform: translateY(-1px); display:inline-block; } +.reply_wrap .title strong em { font-size:13px; font-weight:400; border:1px solid #ccc; box-shadow:0 0 10px 0 rgba(0,0,0,0.1); border-radius:30px; line-height:1em; padding:5px 10px; margin-left:5px; transform: translateY(-1px); display:inline-block; } .reply_wrap .title strong em span { margin-right:5px; } -.reply_list { padding:0px; } +.reply_list { padding:10px 0 0; } .reply_list ul { } -.reply_list ul li { background:#fff; transition:all 0.3s; border-bottom:1px solid #ededed; border-radius:0; position:relative; padding:20px; box-sizing:border-box; } +.reply_list ul li { background:#fafafa; transition:all 0.3s; margin-bottom:10px; border:1px solid #f1f1f1; border-radius:0; position:relative; padding:20px; box-sizing:border-box; border-radius:5px; } .reply_list ul li:last-child { } -.reply_list ul li:hover { border-color:#666; } -.reply_list ul li .by { margin-bottom:10px; font-size:1.1em; display:flex; justify-content: flex-start; align-items:center; flex-wrap: wrap; } -.reply_list ul li .by strong { font-size:13px; font-weight:600; display:inline-block; color:#333; } -.reply_list ul li .by strong::after { width:3px; height:3px; background:#999; content:''; margin:0 7px 4px; display:inline-block; border-radius:10px; } -.reply_list ul li .by em { font-size:13px; margin-right:10px; border:none; color:#666; } -.reply_list ul li .btn_wrap { position:absolute; top:15px; right:15px; } -.reply_list ul li button { border:none; color:#333; } +/* .reply_list ul li:hover { border-color:#666; } */ +.reply_list ul li .by { margin-bottom:15px; font-size:1.1em; display:flex; justify-content: flex-start; align-items:center; flex-wrap:wrap; color:#727272; } +.reply_list ul li .by strong { font-size:12px; font-weight:400; display:inline-block; } +.reply_list ul li .by strong::after { width:3px; height:3px; background:#999; content:''; margin:0 7px 3px; display:inline-block; border-radius:10px; } +.reply_list ul li .by em { font-size:12px; margin-right:10px; border:none; } +.reply_list ul li .btn_wrap { position:absolute; top:15px; right:20px; } +.reply_list ul li button { border:none; background:none; color:#333; } .reply_list ul li button:hover { box-shadow:none; color:#1d69db; } -.reply_list ul li.nothing { padding:0 !important; text-align:left; color:#727272; margin:0 0 20px; background:none; border:none;} +.reply_list ul li.nothing { padding:0 !important; text-align:left; color:#727272; margin:0 0 30px; background:none; border:none;} .reply_list ul li.nothing:hover { border-color:#ddd; } .reply_write { background:#fff; width:100%; border-radius:5px; transition:all 0.3s; border:1px solid #b3b3b3; box-sizing:border-box; margin-top:20px; } Index: base3.10/src/main/webapp/fonts/icomoon.woff =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: base3.10/src/main/webapp/fonts/icomoon.eot =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: base3.10/src/main/webapp/fonts/icomoon.svg =================================================================== --- base3.10/src/main/webapp/fonts/icomoon.svg (revision 72) +++ base3.10/src/main/webapp/fonts/icomoon.svg (revision 73) @@ -34,6 +34,8 @@ <glyph unicode="" glyph-name="say" horiz-adv-x="1106" d="M1073.021 12.255c-46.298 13.617-95.319 59.915-128 119.83 103.489 89.872 160.681 212.426 160.681 343.149 0 29.957-2.723 59.915-8.17 84.426 0 2.723 0 8.17-2.723 10.894 0 2.723 0 5.447 0 5.447v5.447c0 2.723 0 5.447-2.723 8.17 0 2.723-2.723 8.17-2.723 10.894-65.362 209.702-285.957 359.489-536.511 359.489-305.021 0-552.851-217.872-552.851-487.489 0-266.894 247.83-484.766 550.128-484.766 65.362 0 133.447 10.894 198.809 35.404 70.809-57.191 168.851-87.149 277.787-87.149h38.128c16.34 0 29.957 13.617 35.404 32.681 2.723 10.894 0 19.064-5.447 27.234s-13.617 13.617-21.787 16.34zM876.936 170.213c-13.617-10.894-19.064-29.957-10.894-46.298 16.34-38.128 38.128-73.532 65.362-103.489-57.191 13.617-106.213 38.128-141.617 70.809-8.17 8.17-19.064 10.894-27.234 10.894-5.447 0-8.17 0-13.617-2.723-62.638-21.787-128-35.404-193.362-35.404-261.447 0-476.596 182.468-476.596 408.511s215.149 411.234 476.596 411.234c215.149 0 405.787-125.277 462.979-307.745 0-2.723 0-5.447 2.723-8.17 0-2.723 0-5.447 0-5.447 0-2.723 0-8.17 2.723-10.894 0-2.723 0-5.447 2.723-8.17 5.447-19.064 8.17-46.298 8.17-70.809-5.447-117.106-59.915-223.319-157.957-302.298zM593.702 486.128h-78.979c-21.787 0-38.128-16.34-38.128-38.128s16.34-38.128 38.128-38.128h78.979c21.787 0 38.128 16.34 38.128 38.128s-16.34 38.128-38.128 38.128zM364.936 486.128h-81.702c-21.787 0-38.128-16.34-38.128-38.128s16.34-38.128 38.128-38.128h81.702c21.787 0 38.128 16.34 38.128 38.128s-16.34 38.128-38.128 38.128zM833.362 486.128h-81.702c-21.787 0-38.128-16.34-38.128-38.128s16.34-38.128 38.128-38.128h81.702c21.787 0 38.128 16.34 38.128 38.128s-16.34 38.128-38.128 38.128z" /> <glyph unicode="" glyph-name="lock" horiz-adv-x="860" d="M824.792-64h-789.843c-20.969 0-34.949 13.98-34.949 34.949v625.584c0 20.969 13.98 34.949 34.949 34.949h789.843c20.969 0 34.949-13.98 34.949-34.949v-625.584c0-20.969-13.98-34.949-34.949-34.949zM69.898 5.898h719.945v555.686h-719.945v-555.686zM429.87 243.549c-59.413 0-104.846 45.433-104.846 104.846s45.433 104.846 104.846 104.846c59.413 0 104.846-45.433 104.846-104.846s-45.433-104.846-104.846-104.846zM429.87 383.345c-20.969 0-34.949-13.98-34.949-34.949s13.98-34.949 34.949-34.949 34.949 13.98 34.949 34.949-13.98 34.949-34.949 34.949zM429.87 79.29c-20.969 0-34.949 13.98-34.949 34.949v160.765c0 20.969 13.98 34.949 34.949 34.949s34.949-13.98 34.949-34.949v-160.765c0-20.969-13.98-34.949-34.949-34.949zM650.048 561.584h-443.85c-20.969 0-34.949 13.98-34.949 34.949v195.713c0 90.867 76.887 167.754 167.754 167.754h174.744c90.867 0 167.754-76.887 167.754-167.754v-181.734c3.495-3.495 3.495-10.485 3.495-13.98 0-20.969-13.98-34.949-34.949-34.949zM241.147 631.481h370.457v160.765c0 52.423-45.433 97.857-97.857 97.857h-174.744c-52.423 0-97.857-45.433-97.857-97.857v-160.765z" /> <glyph unicode="" glyph-name="people" horiz-adv-x="990" d="M494.794 389.871c-157.181 0-284.599 127.419-284.599 284.599 0 158.111 127.419 285.53 284.599 285.53s284.599-127.419 284.599-284.599c0.93-157.181-127.419-285.53-284.599-285.53zM494.794 866.994c-106.027 0-191.593-86.496-191.593-191.593s86.496-191.593 191.593-191.593c106.027 0 191.593 86.496 191.593 191.593s-85.566 191.593-191.593 191.593zM944.015-64c-26.042 0-46.503 20.461-46.503 46.503 0 134.859-109.748 244.607-244.607 244.607h-315.292c-134.859 0-244.607-109.748-244.607-244.607 0-26.042-20.461-46.503-46.503-46.503s-46.503 20.461-46.503 46.503c0 186.013 151.6 337.613 337.613 337.613h315.292c186.013 0 337.613-151.6 337.613-337.613 0-25.112-21.391-46.503-46.503-46.503z" /> +<glyph unicode="" glyph-name="forward" d="M262.14 960c-113.728-206.032-132.89-520.304 313.86-509.824v253.824l384-384-384-384v248.372c-534.96-13.942-594.572 472.214-313.86 775.628z" /> +<glyph unicode="" glyph-name="cog" d="M933.79 349.75c-53.726 93.054-21.416 212.304 72.152 266.488l-100.626 174.292c-28.75-16.854-62.176-26.518-97.846-26.518-107.536 0-194.708 87.746-194.708 195.99h-201.258c0.266-33.41-8.074-67.282-25.958-98.252-53.724-93.056-173.156-124.702-266.862-70.758l-100.624-174.292c28.97-16.472 54.050-40.588 71.886-71.478 53.638-92.908 21.512-211.92-71.708-266.224l100.626-174.292c28.65 16.696 61.916 26.254 97.4 26.254 107.196 0 194.144-87.192 194.7-194.958h201.254c-0.086 33.074 8.272 66.57 25.966 97.218 53.636 92.906 172.776 124.594 266.414 71.012l100.626 174.29c-28.78 16.466-53.692 40.498-71.434 71.228zM512 240.668c-114.508 0-207.336 92.824-207.336 207.334 0 114.508 92.826 207.334 207.336 207.334 114.508 0 207.332-92.826 207.332-207.334-0.002-114.51-92.824-207.334-207.332-207.334z" /> <glyph unicode="" glyph-name="arrow-thin-u" d="M877.254 557.254l-320 320c-24.992 24.994-65.514 24.994-90.508 0l-320-320c-24.994-24.994-24.994-65.516 0-90.51 24.994-24.996 65.516-24.996 90.51 0l210.744 210.746v-613.49c0-35.346 28.654-64 64-64s64 28.654 64 64v613.49l210.746-210.746c12.496-12.496 28.876-18.744 45.254-18.744s32.758 6.248 45.254 18.746c24.994 24.994 24.994 65.514 0 90.508z" /> <glyph unicode="" glyph-name="arrow-thin-r" d="M621.254 82.746l320 320c24.994 24.992 24.994 65.516 0 90.51l-320 320c-24.994 24.992-65.516 24.992-90.51 0-24.994-24.994-24.994-65.516 0-90.51l210.746-210.746h-613.49c-35.346 0-64-28.654-64-64s28.654-64 64-64h613.49l-210.746-210.746c-12.496-12.496-18.744-28.876-18.744-45.254s6.248-32.758 18.744-45.254c24.994-24.994 65.516-24.994 90.51 0z" /> <glyph unicode="" glyph-name="arrow-thin-d" d="M877.254 338.746l-320-320c-24.992-24.994-65.514-24.994-90.508 0l-320 320c-24.994 24.994-24.994 65.516 0 90.51 24.994 24.996 65.516 24.996 90.51 0l210.744-210.746v613.49c0 35.346 28.654 64 64 64s64-28.654 64-64v-613.49l210.746 210.746c12.496 12.496 28.876 18.744 45.254 18.744s32.758-6.248 45.254-18.746c24.994-24.994 24.994-65.514 0-90.508z" /> Index: base3.10/src/main/webapp/fonts/icomoon.ttf =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: base3.10/src/main/webapp/WEB-INF/tiles/template/defaultTopMenu.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/tiles/template/defaultTopMenu.jsp (revision 72) +++ base3.10/src/main/webapp/WEB-INF/tiles/template/defaultTopMenu.jsp (revision 73) @@ -13,14 +13,13 @@ <ul class="header_left" id="gnb_wrap"> <li><a href="/" title="home">home</a></li> <li><a href="https://www.apctp.org/" target="_blank" title="apctp [새창열림]">apctp</a></li> - <li><a href="<c:url value='/content/about.do'/>" title="about crossroards">about crossroards</a></li> + <li><a href="<c:url value='/content/about.do'/>" title="about crossroards">about</a></li> </ul> <ul class="header_right"> <c:choose> <c:when test="${loginVO != null}"> <li> - <a href="javascript:void(0);">${loginVO.name } 님 환영합니다.</a> - <a href="javascsript:void(0)"><spring:message code="comCmm.top.leftSessionTime"/> - <span id="leftTimeInfo">00:00:00</span></a> + <p>${loginVO.name } 님 환영합니다. <%-- <spring:message code="comCmm.top.leftSessionTime"/> - --%><span id="leftTimeInfo">00:00:00</span></p> <a href="javascript:void(0);" id="addSessionTerm"><spring:message code="comCmm.top.incSessionTime"/></a> </li> <li><a href="<c:url value="/uat/uia/actionLogout.do"/>" title="로그아웃">logout</a></li> 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 72) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cmm/fms/EgovFileList.jsp (revision 73) @@ -82,18 +82,18 @@ <c:when test="${authorType eq 'user'}"> <li>  - <div class="file_wrap"> + <div class="file_box"> <p class="file_name"> <em class="blind">첨부파일명</em><c:out value="${item.originFileNm}" /> </p>  - <a href="${item.link }" class="btn_sq_s btn_filedown" title="<c:out value="${item.originFileNm}" /> 다운받기"><span class="blind">첨부파일다운로드</span></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> </div> </li> </c:when> <c:otherwise> <li class="${fileIcon}"> - <div class="file_wrap"> + <div class="file_box"> <p class="file_name"> <em class="blind">첨부파일명</em><c:out value="${item.originFileNm}" /> </p> 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 72) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleList.jsp (revision 73) @@ -105,12 +105,17 @@ <tbody>  <c:forEach items="${noticeList}" var="noticeInfo" varStatus="status"> - <tr> - <td class="board_num"><img src="<c:url value='/images/egovframework/com/cop/bbs/icon_notice.png'/>" alt="notice"></td> + <tr class="notice"> + <td class="board_num"><em>공지</em></td> <td class="bold board_tit"> <a href="#!" onclick="fn_egov_inquire_articledetail('${noticeInfo.bbsId }', '${noticeInfo.nttId }');"> - <c:out value='${fn:substring(noticeInfo.nttSj, 0, 40)}'/><c:if test="${noticeInfo.commentCo != ''}"> <c:out value='[${noticeInfo.commentCo}]'/></c:if> + <c:out value='${fn:substring(noticeInfo.nttSj, 0, 40)}'/> </a> + <c:if test="${noticeInfo.commentCo != ''}"> + <div class="count_comment"> + <span class="icon-say"></span><c:out value='[${noticeInfo.commentCo}]'/> + </div> + </c:if> </td> <%-- <td><c:out value='${noticeInfo.frstRegisterNm}'/></td> --%> <td> @@ -128,14 +133,18 @@ <td class="board_num"> <p><c:out value="${(searchVO.pageIndex-1) * searchVO.pageSize + status.count}"/></p> </td> - <c:choose> <c:when test="${resultInfo.sjBoldAt == 'Y'}">  <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)}'/><c:if test="${resultInfo.commentCo != ''}"> <c:out value='[${resultInfo.commentCo}]'/></c:if> - </a> + <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}"> @@ -146,9 +155,11 @@   </c:forEach> </c:if> - <img src="<c:url value='/images/egovframework/com/cop/bbs/icon_lock.png'/>" alt="secret"> <c:out value='${fn:substring(resultInfo.nttSj, 0, 40)}'/> + <span class="icon-lock"></span><c:out value='${fn:substring(resultInfo.nttSj, 0, 40)}'/> <c:if test="${resultInfo.commentCo != ''}"> - <c:out value='[${resultInfo.commentCo}]'/> + <div class="count_comment"><span class="icon-say"></span> + <c:out value='[${resultInfo.commentCo}]'/> + </div> </c:if> </td> </c:when> @@ -156,8 +167,13 @@  <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)}'/><c:if test="${resultInfo.commentCo != ''}"> <c:out value='[${resultInfo.commentCo}]'/></c:if> + <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:otherwise> </c:choose> 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 72) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleReply.jsp (revision 73) @@ -100,6 +100,9 @@ <form:form commandName="articleVO" action="${pageContext.request.contextPath}/cop/bbs/${reBbsId }/replyArticle.do" method="post" onSubmit="fn_egov_reply_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>  @@ -140,14 +143,20 @@ <c:if test="${boardMasterVO.fileAtchPosblAt == 'Y'}"> <li> - <strong class="board_label">첨부파일</strong> + <strong class="title">첨부파일</strong> <div class="file_up"> <div> + <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;"> + </ul> <em class="exp filenote">※ 파일당 ${boardMasterVO.atchPosblFileSize }MB까지 첨부 가능합니다.</em> <div class="file_list" id="egovComFileList"></div> </div> @@ -168,11 +177,12 @@ <input name="pageIndex" type="hidden" value="<c:out value='${searchVO.pageIndex}'/>"/> <input name="searchKeyword" type="hidden" value="${searchVO.searchKeyword}" /> + <input name="searchCondition" type="hidden" value="${searchVO.searchCondition}" /> <input type="hidden" name="bbsTyCode" value="<c:out value='${boardMasterVO.bbsTyCode}'/>" /> <input type="hidden" name="replyPosblAt" value="<c:out value='${boardMasterVO.replyPosblAt}'/>" /> <input type="hidden" name="fileAtchPosblAt" value="<c:out value='${boardMasterVO.fileAtchPosblAt}'/>" /> <input type="hidden" id="atchPosblFileNumber" name="atchPosblFileNumber" value="<c:out value='${boardMasterVO.atchPosblFileNumber}'/>" /> - <input type="hidden" id="atchPosblFileSize" name="atchPosblFileSize" value="<c:out value='${boardMasterVO.atchPosblFileSize}'/>" /> + <input type="hidden" name="atchPosblFileSize" value="<c:out value='${boardMasterVO.atchPosblFileSize}'/>" /> <input type="hidden" name="parnts" value="<c:out value='${result.parnts}'/>" /> <input type="hidden" name="sortOrdr" value="<c:out value='${result.sortOrdr}'/>" /> @@ -189,14 +199,14 @@ var atchPosblFileNumber = $('#atchPosblFileNumber').val(); var atchPosblFileSize = $('#atchPosblFileSize').val(); var options = { - fileListDivId : 'egovComFileList', - inputFileId : 'egovComFileUploader', - hiddenFileName : 'atchFileId', - txtAreaId : 'nttCn', - authorType : 'user', - maxSize : atchPosblFileNumber, - fileMaxSize : atchPosblFileSize - } + fileListDivId : 'egovComFileList', + inputFileId : 'egovComFileUploader', + hiddenFileName : 'atchFileId', + txtAreaId : 'nttCn', + authorType : 'user', + maxSize: atchPosblFileNumber, + fileMaxSize: atchPosblFileSize + } $('#nttCn').initEditor(options); /* 비밀글 설정시 비밀번호입력창 show */ 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 72) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleDetail.jsp (revision 73) @@ -111,7 +111,7 @@ <div class="inner"> <div class="board_view"> - <div class="board_header"> <strong><c:out value="${result.nttSj}"/></strong> + <div class="board_header"><strong><c:out value="${result.nttSj}"/></strong> <div class="info"> <div class="by"> <p><em><spring:message code="table.reger" /></em><c:out value="${result.frstRegisterNm}"/></p> @@ -125,7 +125,7 @@ </div> </div> </div> - + <c:if test="${not empty result.atchFileId}">  <c:import url="/editor/fileListView.do" charEncoding="utf-8"> @@ -134,7 +134,7 @@ <c:param name="authorType" value="user" /> </c:import> </c:if> - + <div class="board_content fr-view"> <c:out value="${fn:replace(result.nttCn , crlf , '<br/>')}" escapeXml="false" /> </div> Index: base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/cmt/EgovArticleCommentList.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/cmt/EgovArticleCommentList.jsp (revision 72) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/cmt/EgovArticleCommentList.jsp (revision 73) @@ -39,16 +39,15 @@ <strong><c:out value="${result.wrterNm}" /></strong> <em class="date"><c:out value="${result.frstRegisterPnttm}" /></em> <div class="btn_wrap"> - <c:if test="${result.wrterId == sessionUniqId}"> - <button onClick="location.href='javascript:fn_egov_selectCommentForupdt(${result.commentNo})'" title="<spring:message code="button.update" />"><em class="blind"><spring:message code="button.update" /></em><span class="icon-pencil"></span></button> - <button onClick="location.href='javascript:fn_egov_deleteCommentList(${result.commentNo})'" title="<spring:message code="button.delete" />"><em class="blind"><spring:message code="button.delete" /></em><span class="icon-delete"></span></button> - </c:if> - </div> + <c:if test="${result.wrterId == sessionUniqId}"> + <button onClick="location.href='javascript:fn_egov_selectCommentForupdt(${result.commentNo})'" title="<spring:message code="button.update" />"><em class="blind"><spring:message code="button.update" /></em><span class="icon-pencil"></span></button> + <button onClick="location.href='javascript:fn_egov_deleteCommentList(${result.commentNo})'" title="<spring:message code="button.delete" />"><em class="blind"><spring:message code="button.delete" /></em><span class="icon-delete"></span></button> + </c:if> + </div> </div> <p class="txt"> <c:out value="${fn:replace(result.commentCn , crlf , '<br/>')}" escapeXml="false" /> </p> - </li> </c:forEach> <c:if test="${fn:length(resultList) == 0}"> Index: base3.10/src/main/webapp/images/user/icon-file-down.svg =================================================================== --- base3.10/src/main/webapp/images/user/icon-file-down.svg (nonexistent) +++ base3.10/src/main/webapp/images/user/icon-file-down.svg (revision 73) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> + +<svg version="1.1" id="레이어_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" + y="0px" viewBox="0 0 39.5 40.4" style="enable-background:new 0 0 39.5 40.4;" xml:space="preserve"> +<g> + <g> + <path d="M19.8,30.4c-0.5,0-1-0.2-1.4-0.6L5.5,17c-0.8-0.8-0.8-2,0-2.8c0.8-0.8,2-0.8,2.8,0l11.4,11.4l11.4-11.4 + c0.8-0.8,2-0.8,2.8,0c0.8,0.8,0.8,2,0,2.8L21.2,29.8C20.8,30.2,20.3,30.4,19.8,30.4z"/> + </g> + <path d="M19.8,30.4c-1.1,0-2-0.9-2-2V2c0-1.1,0.9-2,2-2s2,0.9,2,2v26.4C21.8,29.5,20.9,30.4,19.8,30.4z"/> + <path d="M37.5,40.4H2c-1.1,0-2-0.9-2-2V26c0-1.1,0.9-2,2-2s2,0.9,2,2v10.4h31.5V26c0-1.1,0.9-2,2-2s2,0.9,2,2v12.4 + C39.5,39.5,38.6,40.4,37.5,40.4z"/> +</g> +</svg> Index: base3.10/src/main/webapp/js/user/designJS.js =================================================================== --- base3.10/src/main/webapp/js/user/designJS.js (revision 72) +++ base3.10/src/main/webapp/js/user/designJS.js (revision 73) @@ -487,9 +487,16 @@ var etc = { 'etc': function () { -//must * 추가 -$(".must").find("strong.title").append("<b class='mustText'>*</b>"); - + //must * 추가 + $(".must").find("strong.title").append("<b class='mustText'>*</b>"); + + //board list a 넓이값 + $(".board_list").find(".board_tit").each(function(){ + var say = $(this).children(".count_comment").width() + 10; + console.log(say) + $(this).find("a").css({ maxWidth : "calc(100% - " + say + "px)" }); + }) + } } Index: base3.10/src/main/webapp/html/design/css/font.css =================================================================== --- base3.10/src/main/webapp/html/design/css/font.css (revision 72) +++ base3.10/src/main/webapp/html/design/css/font.css (revision 73) @@ -118,6 +118,12 @@ .icon-pencil:before { content: "\e917"; } +.icon-forward:before { + content: "\e969"; +} +.icon-cog:before { + content: "\e994"; +} .icon-arrow-thin-u:before { content: "\ea3a"; } Index: base3.10/src/main/webapp/html/design/fonts/icomoon.woff =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: base3.10/src/main/webapp/html/design/fonts/icomoon.eot =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: base3.10/src/main/webapp/html/design/fonts/icomoon.svg =================================================================== --- base3.10/src/main/webapp/html/design/fonts/icomoon.svg (revision 72) +++ base3.10/src/main/webapp/html/design/fonts/icomoon.svg (revision 73) @@ -34,6 +34,8 @@ <glyph unicode="" glyph-name="say" horiz-adv-x="1106" d="M1073.021 12.255c-46.298 13.617-95.319 59.915-128 119.83 103.489 89.872 160.681 212.426 160.681 343.149 0 29.957-2.723 59.915-8.17 84.426 0 2.723 0 8.17-2.723 10.894 0 2.723 0 5.447 0 5.447v5.447c0 2.723 0 5.447-2.723 8.17 0 2.723-2.723 8.17-2.723 10.894-65.362 209.702-285.957 359.489-536.511 359.489-305.021 0-552.851-217.872-552.851-487.489 0-266.894 247.83-484.766 550.128-484.766 65.362 0 133.447 10.894 198.809 35.404 70.809-57.191 168.851-87.149 277.787-87.149h38.128c16.34 0 29.957 13.617 35.404 32.681 2.723 10.894 0 19.064-5.447 27.234s-13.617 13.617-21.787 16.34zM876.936 170.213c-13.617-10.894-19.064-29.957-10.894-46.298 16.34-38.128 38.128-73.532 65.362-103.489-57.191 13.617-106.213 38.128-141.617 70.809-8.17 8.17-19.064 10.894-27.234 10.894-5.447 0-8.17 0-13.617-2.723-62.638-21.787-128-35.404-193.362-35.404-261.447 0-476.596 182.468-476.596 408.511s215.149 411.234 476.596 411.234c215.149 0 405.787-125.277 462.979-307.745 0-2.723 0-5.447 2.723-8.17 0-2.723 0-5.447 0-5.447 0-2.723 0-8.17 2.723-10.894 0-2.723 0-5.447 2.723-8.17 5.447-19.064 8.17-46.298 8.17-70.809-5.447-117.106-59.915-223.319-157.957-302.298zM593.702 486.128h-78.979c-21.787 0-38.128-16.34-38.128-38.128s16.34-38.128 38.128-38.128h78.979c21.787 0 38.128 16.34 38.128 38.128s-16.34 38.128-38.128 38.128zM364.936 486.128h-81.702c-21.787 0-38.128-16.34-38.128-38.128s16.34-38.128 38.128-38.128h81.702c21.787 0 38.128 16.34 38.128 38.128s-16.34 38.128-38.128 38.128zM833.362 486.128h-81.702c-21.787 0-38.128-16.34-38.128-38.128s16.34-38.128 38.128-38.128h81.702c21.787 0 38.128 16.34 38.128 38.128s-16.34 38.128-38.128 38.128z" /> <glyph unicode="" glyph-name="lock" horiz-adv-x="860" d="M824.792-64h-789.843c-20.969 0-34.949 13.98-34.949 34.949v625.584c0 20.969 13.98 34.949 34.949 34.949h789.843c20.969 0 34.949-13.98 34.949-34.949v-625.584c0-20.969-13.98-34.949-34.949-34.949zM69.898 5.898h719.945v555.686h-719.945v-555.686zM429.87 243.549c-59.413 0-104.846 45.433-104.846 104.846s45.433 104.846 104.846 104.846c59.413 0 104.846-45.433 104.846-104.846s-45.433-104.846-104.846-104.846zM429.87 383.345c-20.969 0-34.949-13.98-34.949-34.949s13.98-34.949 34.949-34.949 34.949 13.98 34.949 34.949-13.98 34.949-34.949 34.949zM429.87 79.29c-20.969 0-34.949 13.98-34.949 34.949v160.765c0 20.969 13.98 34.949 34.949 34.949s34.949-13.98 34.949-34.949v-160.765c0-20.969-13.98-34.949-34.949-34.949zM650.048 561.584h-443.85c-20.969 0-34.949 13.98-34.949 34.949v195.713c0 90.867 76.887 167.754 167.754 167.754h174.744c90.867 0 167.754-76.887 167.754-167.754v-181.734c3.495-3.495 3.495-10.485 3.495-13.98 0-20.969-13.98-34.949-34.949-34.949zM241.147 631.481h370.457v160.765c0 52.423-45.433 97.857-97.857 97.857h-174.744c-52.423 0-97.857-45.433-97.857-97.857v-160.765z" /> <glyph unicode="" glyph-name="people" horiz-adv-x="990" d="M494.794 389.871c-157.181 0-284.599 127.419-284.599 284.599 0 158.111 127.419 285.53 284.599 285.53s284.599-127.419 284.599-284.599c0.93-157.181-127.419-285.53-284.599-285.53zM494.794 866.994c-106.027 0-191.593-86.496-191.593-191.593s86.496-191.593 191.593-191.593c106.027 0 191.593 86.496 191.593 191.593s-85.566 191.593-191.593 191.593zM944.015-64c-26.042 0-46.503 20.461-46.503 46.503 0 134.859-109.748 244.607-244.607 244.607h-315.292c-134.859 0-244.607-109.748-244.607-244.607 0-26.042-20.461-46.503-46.503-46.503s-46.503 20.461-46.503 46.503c0 186.013 151.6 337.613 337.613 337.613h315.292c186.013 0 337.613-151.6 337.613-337.613 0-25.112-21.391-46.503-46.503-46.503z" /> +<glyph unicode="" glyph-name="forward" d="M262.14 960c-113.728-206.032-132.89-520.304 313.86-509.824v253.824l384-384-384-384v248.372c-534.96-13.942-594.572 472.214-313.86 775.628z" /> +<glyph unicode="" glyph-name="cog" d="M933.79 349.75c-53.726 93.054-21.416 212.304 72.152 266.488l-100.626 174.292c-28.75-16.854-62.176-26.518-97.846-26.518-107.536 0-194.708 87.746-194.708 195.99h-201.258c0.266-33.41-8.074-67.282-25.958-98.252-53.724-93.056-173.156-124.702-266.862-70.758l-100.624-174.292c28.97-16.472 54.050-40.588 71.886-71.478 53.638-92.908 21.512-211.92-71.708-266.224l100.626-174.292c28.65 16.696 61.916 26.254 97.4 26.254 107.196 0 194.144-87.192 194.7-194.958h201.254c-0.086 33.074 8.272 66.57 25.966 97.218 53.636 92.906 172.776 124.594 266.414 71.012l100.626 174.29c-28.78 16.466-53.692 40.498-71.434 71.228zM512 240.668c-114.508 0-207.336 92.824-207.336 207.334 0 114.508 92.826 207.334 207.336 207.334 114.508 0 207.332-92.826 207.332-207.334-0.002-114.51-92.824-207.334-207.332-207.334z" /> <glyph unicode="" glyph-name="arrow-thin-u" d="M877.254 557.254l-320 320c-24.992 24.994-65.514 24.994-90.508 0l-320-320c-24.994-24.994-24.994-65.516 0-90.51 24.994-24.996 65.516-24.996 90.51 0l210.744 210.746v-613.49c0-35.346 28.654-64 64-64s64 28.654 64 64v613.49l210.746-210.746c12.496-12.496 28.876-18.744 45.254-18.744s32.758 6.248 45.254 18.746c24.994 24.994 24.994 65.514 0 90.508z" /> <glyph unicode="" glyph-name="arrow-thin-r" d="M621.254 82.746l320 320c24.994 24.992 24.994 65.516 0 90.51l-320 320c-24.994 24.992-65.516 24.992-90.51 0-24.994-24.994-24.994-65.516 0-90.51l210.746-210.746h-613.49c-35.346 0-64-28.654-64-64s28.654-64 64-64h613.49l-210.746-210.746c-12.496-12.496-18.744-28.876-18.744-45.254s6.248-32.758 18.744-45.254c24.994-24.994 65.516-24.994 90.51 0z" /> <glyph unicode="" glyph-name="arrow-thin-d" d="M877.254 338.746l-320-320c-24.992-24.994-65.514-24.994-90.508 0l-320 320c-24.994 24.994-24.994 65.516 0 90.51 24.994 24.996 65.516 24.996 90.51 0l210.744-210.746v613.49c0 35.346 28.654 64 64 64s64-28.654 64-64v-613.49l210.746 210.746c12.496 12.496 28.876 18.744 45.254 18.744s32.758-6.248 45.254-18.746c24.994-24.994 24.994-65.514 0-90.508z" /> Index: base3.10/src/main/webapp/html/design/fonts/icomoon.ttf =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: base3.10/src/main/webapp/resource/editor/css/froala_style.css =================================================================== --- base3.10/src/main/webapp/resource/editor/css/froala_style.css (revision 72) +++ base3.10/src/main/webapp/resource/editor/css/froala_style.css (revision 73) @@ -447,8 +447,8 @@ max-width: calc(100% - 5px); } /*에디터 파일첨부*/ -.fr-file { margin:2px; padding:7px 35px 7px 13px; font-size:0.9em; max-width:200px; overflow:hidden; display:inline-block; text-overflow:ellipsis; white-space:nowrap; border:1px solid #ccc; position:relative; border-radius:5px; transition:all 0.3s; } +.fr-file { margin:2px; padding:5px 35px 5px 13px; font-size:0.9em; max-width:200px; overflow:hidden; display:inline-block; text-overflow:ellipsis; white-space:nowrap; border:1px solid #ccc; position:relative; border-radius:50px; transition:all 0.3s; } .fr-file::after { content:'' !important; position:absolute !important; top:8px; right:8px; display:inline-block; width:20px; height:20px; background: url(../../../images/admin/icon_filedown.svg) 50% 50% no-repeat; background-size:15px; } .fr-file:hover { border:1px solid #999; box-shadow:0 0 5px 0 rgba(0,0,0,0.1); } -.fr-element .fr-file { padding:7px 13px 7px 35px; background:#f9f9f9; } +.fr-element .fr-file { padding:5px 13px 5px 35px; background:#FFF; } .fr-element .fr-file::after { left:8px; right:auto; background: url(../../../images/admin/file.svg) 50% 50% no-repeat; background-size:13px; } \ No newline at end of file

Add a comment

List

Delete comment