Commit @61 - jhleem/egov

Files
Commit

한선우 2022-02-16 @61

Index: base3.10/src/main/webapp/css/user/common.css =================================================================== --- base3.10/src/main/webapp/css/user/common.css (revision 60) +++ base3.10/src/main/webapp/css/user/common.css (revision 61) @@ -260,6 +260,7 @@ /*게시판 하단*/ .bottom_wrap { display:flex; padding-top:50px; position:relative; } +.bottom_wrap > div { display:flex; flex-wrap:wrap; } .bottom_wrap.center { justify-content: center; } .bottom_wrap.between { justify-content:space-between; } .bottom_wrap.right { justify-content:flex-end; } Index: base3.10/src/main/webapp/css/user/font.css =================================================================== --- base3.10/src/main/webapp/css/user/font.css (revision 60) +++ base3.10/src/main/webapp/css/user/font.css (revision 61) @@ -37,6 +37,15 @@ } +.icon-say:before { + content: "\e918"; +} +.icon-lock:before { + content: "\e919"; +} +.icon-people:before { + content: "\e91a"; +} .icon-file-excel:before { content: "\e90d"; } @@ -106,6 +115,9 @@ .icon-search:before { content: "\e90a"; } +.icon-pencil:before { + content: "\e917"; +} .icon-arrow-thin-u:before { content: "\ea3a"; } Index: base3.10/src/main/webapp/css/user/board.css =================================================================== --- base3.10/src/main/webapp/css/user/board.css (revision 60) +++ base3.10/src/main/webapp/css/user/board.css (revision 61) @@ -13,13 +13,14 @@ .board_list .board_num strong { font-weight:600; color:#1524cc; } /*basic view*/ -.board_header { border-top:2px solid #333;border-bottom:1px solid #ededed; padding:30px 0; } +.board_header { border-top:2px solid #333;border-bottom:1px solid #ededed; padding:25px 0; } .board_header .info { display:flex; justify-content: space-between; } -.board_header strong { font-size:1.5em; line-height:1.6em; margin-bottom:20px; display: block; font-weight:900; } +.board_header strong { font-size:1.5em; line-height:1.6em; margin-bottom:15px; display: block; font-weight:900; } .board_header .by { display: flex; justify-content:flex-start; align-items:center; } -.board_header .by p { color:#666; display:inline-block; } +.board_header .by p { color:#333; display:inline-block; font-weight:600; } .board_header .by p::after { content:''; width:2px; height:2px; background:#666; display:inline-block; border-radius:5px; margin:0 10px 4px; } .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; } @@ -72,6 +73,39 @@ .text_show .inputText[disabled] + label, .text_show .textArea[disabled] + label, .text_show .inputText[readonly] + label, .text_show .textArea[readonly] + label { visibility:hidden; } .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 .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 span { margin-right:5px; } + +.reply_list { padding:0px; } +.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: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 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: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; } +.reply_write .textArea { width:100%; height:80px; border:none; border-radius:5px 0 0 5px; padding:20px; background:transparent; } +.reply_write .textArea:focus { box-shadow:none; border:none; } +.reply_write .textArea:hover { box-shadow:none; } +.reply_write .textArea[disabled]:hover { border:none; } +.reply_write .bottom { border-top:1px solid #e4e4e4; text-align:right; } +.reply_write .bottom button { border:none; border-radius:0 0 5px 0; border-left:1px solid #e4e4e4; } +.reply_write .bottom button:hover { box-shadow:none; } + +.reply_wrap .pagination { margin:25px 0 40px; } + @media all and (max-width: 1000px) { 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 60) +++ base3.10/src/main/webapp/fonts/icomoon.svg (revision 61) @@ -28,8 +28,12 @@ <glyph unicode="" glyph-name="file-word" horiz-adv-x="768" d="M739.655 764.039l-167.767 167.767c-17.997 17.997-42.391 28.194-67.787 28.194h-408.121c-52.989-0.2-95.98-43.191-95.98-96.181v-831.837c0-52.991 42.991-95.984 95.982-95.984h575.889c52.991 0 95.982 42.993 95.982 95.984v664.071c-0.002 25.394-10.2 49.989-28.197 67.986zM664.071 703.851h-152.172v152.17l152.172-152.17zM95.98 31.984v831.835h319.937v-207.959c0-26.594 21.395-47.991 47.989-47.991h207.96v-575.887h-575.887zM536.096 477.139c-11.399 0-21.196-7.997-23.397-18.996-41.191-195.362-40.792-190.764-41.992-206.961-0.399 2.401-0.8 5.199-1.398 8.599-1.601 10.199 0.6-0.399-47.19 198.96-2.6 10.799-12.199 18.397-23.397 18.397h-26.596c-10.999 0-20.595-7.598-23.395-18.196-48.791-197.963-47.991-192.363-49.59-207.36-0.2 2.2-0.399 5.001-0.999 8.402-1.4 10.397-28.195 146.572-38.193 197.959-2.2 11.2-11.998 19.397-23.596 19.397h-33.592c-15.596 0-26.995-14.596-23.397-29.595 15.998-65.186 53.39-218.957 66.388-271.946 2.6-10.796 12.197-18.196 23.397-18.196h50.39c10.999 0 20.595 7.401 23.194 18.196l35.794 142.773c2.999 12.398 5 23.997 5.999 34.595l5.799-34.595c0.2-0.8 25.194-100.978 35.794-142.773 2.599-10.598 12.197-18.196 23.194-18.196h49.391c10.999 0 20.597 7.401 23.196 18.196 41.591 163.77 60.388 237.955 68.985 271.946 3.799 15.2-7.598 29.795-23.196 29.795h-31.592v-0.401z" /> <glyph unicode="" glyph-name="file-zip" horiz-adv-x="768" d="M739.655 764.238l-167.768 167.768c-17.997 17.997-42.391 28.194-67.787 28.194h-408.122c-52.987-0.2-95.979-43.191-95.979-96.182v-831.838c0-52.994 42.991-95.987 95.982-95.987h575.888c52.994 0 95.986 42.993 95.986 95.987v664.072c-0.005 25.394-10.204 49.99-28.201 67.986zM664.069 704.050h-152.172v152.17l152.172-152.17zM95.979 32.182v831.836h319.938v-207.959c0-26.594 21.392-47.991 47.986-47.991h207.962v-575.888l-575.886 0.002zM209.624 263.863l78.923 120.784h-71.374v28.137h112.778v-20.131l-78.694-120.784h79.609v-28.366h-121.244v20.36zM360.826 412.786h33.857v-169.283h-33.857v169.283zM436.309 412.786h55.589c37.517 0 66.342-13.038 66.342-53.072 0-38.661-29.054-56.047-65.425-56.047h-22.647v-60.163h-33.861v169.281zM490.528 330.432c23.332 0 34.542 9.838 34.542 29.281 0 19.674-12.356 26.309-35.687 26.309h-19.214v-55.589h20.36z" /> <glyph unicode="" glyph-name="cal" horiz-adv-x="964" d="M849.886-64h-735.976c-62.782 0-113.911 51.083-113.911 113.911v637.541c0 62.782 51.083 113.911 113.911 113.911h736.022c62.782 0 113.911-51.083 113.911-113.911v-637.541c-0.046-62.828-51.129-113.911-113.957-113.911zM113.911 704.127c-9.166 0-16.628-7.508-16.628-16.674v-637.541c0-9.166 7.462-16.674 16.628-16.674h736.022c9.166 0 16.628 7.508 16.628 16.674v637.541c0 9.212-7.462 16.674-16.628 16.674h-736.022zM337.265 794.592c0-7.232-5.85-13.082-13.035-13.082h-100.599c-7.186 0-13.035 5.85-13.035 13.082v152.372c0 7.232 5.85 13.082 13.035 13.082h100.599c7.186 0 13.035-5.85 13.035-13.082v-152.372zM753.249 794.592c0-7.232-5.85-13.082-13.035-13.082h-100.599c-7.186 0-13.035 5.85-13.035 13.082v152.372c0 7.232 5.85 13.082 13.035 13.082h100.599c7.186 0 13.035-5.85 13.035-13.082v-152.372zM333.626 432.915c0-14.417-11.7-26.117-26.117-26.117h-74.39c-14.417 0-26.117 11.7-26.117 26.117v74.436c0 14.417 11.7 26.117 26.117 26.117h74.39c14.417 0 26.117-11.7 26.117-26.117v-74.436zM545.234 432.915c0-14.417-11.7-26.117-26.117-26.117h-74.39c-14.417 0-26.117 11.7-26.117 26.117v74.436c0 14.417 11.7 26.117 26.117 26.117h74.39c14.417 0 26.117-11.7 26.117-26.117v-74.436zM756.842 432.915c0-14.417-11.7-26.117-26.117-26.117h-74.39c-14.417 0-26.117 11.7-26.117 26.117v74.436c0 14.417 11.7 26.117 26.117 26.117h74.39c14.417 0 26.117-11.7 26.117-26.117v-74.436zM333.626 230.013c0-14.417-11.7-26.117-26.117-26.117h-74.39c-14.417 0-26.117 11.7-26.117 26.117v74.39c0 14.417 11.7 26.117 26.117 26.117h74.39c14.417 0 26.117-11.7 26.117-26.117v-74.39zM545.234 230.013c0-14.417-11.7-26.117-26.117-26.117h-74.39c-14.417 0-26.117 11.7-26.117 26.117v74.39c0 14.417 11.7 26.117 26.117 26.117h74.39c14.417 0 26.117-11.7 26.117-26.117v-74.39zM756.842 230.013c0-14.417-11.7-26.117-26.117-26.117h-74.39c-14.417 0-26.117 11.7-26.117 26.117v74.39c0 14.417 11.7 26.117 26.117 26.117h74.39c14.417 0 26.117-11.7 26.117-26.117v-74.39z" /> -<glyph unicode="" glyph-name="trash" horiz-adv-x="896" d="M536 128h48c13.255 0 24 10.745 24 24v0 432c0 13.255-10.745 24-24 24v0h-48c-13.255 0-24-10.745-24-24v0-432c0-13.255 10.745-24 24-24v0zM864 800h-164.82l-68 113.4c-17.083 28.11-47.539 46.6-82.314 46.6-0.016 0-0.032 0-0.048 0h-201.637c-0.002 0-0.004 0-0.006 0-34.775 0-65.231-18.49-82.074-46.175l-0.24-0.425-68.040-113.4h-164.82c-17.673 0-32-14.327-32-32v0-32c0-17.673 14.327-32 32-32v0h32v-672c0-53.019 42.981-96 96-96v0h576c53.019 0 96 42.981 96 96v0 672h32c17.673 0 32 14.327 32 32v0 32c0 17.673-14.327 32-32 32v0zM343.68 858.18c2.136 3.511 5.941 5.82 10.286 5.82 0.012 0 0.024 0 0.036 0h187.998c0.004 0 0.009 0 0.014 0 4.345 0 8.15-2.309 10.256-5.767l0.030-0.053 34.92-58.18h-278.44zM736 32h-576v672h576zM312 128h48c13.255 0 24 10.745 24 24v0 432c0 13.255-10.745 24-24 24v0h-48c-13.255 0-24-10.745-24-24v0-432c0-13.255 10.745-24 24-24v0z" /> +<glyph unicode="" glyph-name="delete" horiz-adv-x="896" d="M536 128h48c13.255 0 24 10.745 24 24v0 432c0 13.255-10.745 24-24 24v0h-48c-13.255 0-24-10.745-24-24v0-432c0-13.255 10.745-24 24-24v0zM864 800h-164.82l-68 113.4c-17.083 28.11-47.539 46.6-82.314 46.6-0.016 0-0.032 0-0.048 0h-201.637c-0.002 0-0.004 0-0.006 0-34.775 0-65.231-18.49-82.074-46.175l-0.24-0.425-68.040-113.4h-164.82c-17.673 0-32-14.327-32-32v0-32c0-17.673 14.327-32 32-32v0h32v-672c0-53.019 42.981-96 96-96v0h576c53.019 0 96 42.981 96 96v0 672h32c17.673 0 32 14.327 32 32v0 32c0 17.673-14.327 32-32 32v0zM343.68 858.18c2.136 3.511 5.941 5.82 10.286 5.82 0.012 0 0.024 0 0.036 0h187.998c0.004 0 0.009 0 0.014 0 4.345 0 8.15-2.309 10.256-5.767l0.030-0.053 34.92-58.18h-278.44zM736 32h-576v672h576zM312 128h48c13.255 0 24 10.745 24 24v0 432c0 13.255-10.745 24-24 24v0h-48c-13.255 0-24-10.745-24-24v0-432c0-13.255 10.745-24 24-24v0z" /> <glyph unicode="" glyph-name="file" horiz-adv-x="892" d="M811.952 458.371c-6.798 6.638-18.323 6.369-24.881-0.312l-354.442-362.583c-36.77-37.605-85.595-58.339-137.441-58.339-52.195 0-101.223 20.981-138.117 59.007-75.979 78.412-74.868 206.623 2.535 285.761l432.128 442.041c44.163 45.063 120.411 44.976 164.457 0 46.203-47.307 46.203-124.216 0-171.473l-376.665-384.901c-14.808-15.091-40.023-14.852-54.504 0.465-15.2 16.173-14.539 42.594 1.503 59.007l296.096 302.465c6.79 6.936 6.667 18.069-0.24 24.896l-47.104 46.058c-6.667 6.609-18.316 6.5-24.874-0.24l-296.096-302.465c-53.509-54.737-54.773-143.956-2.832-199.005 26.718-28.287 62.58-43.858 101.1-43.858 37.481 0 72.704 14.91 99.161 41.94l376.672 384.966c84.295 86.227 84.295 226.551 0 312.763-41.214 42.187-96.060 65.434-154.464 65.434s-113.272-23.247-154.486-65.434l-432.128-442.012c-115.334-117.942-116.598-309.379-2.796-426.783 56.124-57.867 130.963-89.771 210.777-89.771 79.16 0 153.607 31.548 209.6 88.863l354.442 362.554c3.304 3.377 5.047 7.742 4.997 12.441 0 4.735-1.939 9.136-5.294 12.382l-47.104 46.131z" /> +<glyph unicode="" glyph-name="pencil" d="M864 960c88.364 0 160-71.634 160-160 0-36.020-11.91-69.258-32-96l-64-64-224 224 64 64c26.742 20.090 59.978 32 96 32zM64 224l-64-288 288 64 592 592-224 224-592-592zM715.578 596.422l-448-448-55.156 55.156 448 448 55.156-55.156z" /> +<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="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/jsp/egovframework/com/cop/bbs/EgovArticleList.jsp =================================================================== --- base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleList.jsp (revision 60) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleList.jsp (revision 61) @@ -88,6 +88,7 @@ <colgroup> <col class="width100"> <col class="widthauto"> + <col class="width80"> <col class="width150"> </colgroup> <thead> @@ -95,6 +96,7 @@ <th><spring:message code="table.num" /></th> <th class="board_th_link"><spring:message code="comCopBbs.articleVO.list.nttSj" /></th> <%-- <th><spring:message code="table.reger" /></th> --%> + <th>첨부파일</th> <th><spring:message code="table.regdate" /></th> <%-- <th><spring:message code="comCopBbs.articleVO.list.inqireCo" /></th> --%> </tr> @@ -111,6 +113,7 @@ </a> </td> <%-- <td><c:out value='${noticeInfo.frstRegisterNm}'/></td> --%> + <td><span class="icon-file"></span></td> <td><c:out value='${noticeInfo.frstRegisterPnttm}'/></td> <%-- <td><c:out value='${noticeInfo.inqireCo}'/></td> --%> </tr> @@ -158,6 +161,7 @@ </c:otherwise> </c:choose> <%-- <td><c:out value='${resultInfo.frstRegisterNm}'/></td> --%> + <td><span class="icon-file"></span></td> <td><c:out value='${resultInfo.frstRegisterPnttm}'/></td> <%-- <td><c:out value='${resultInfo.inqireCo}'/></td> --%> </tr> @@ -166,7 +170,7 @@ <c:if test="${fn:length(resultList) == 0}">  <tr> - <td colspan="3"><spring:message code="common.nodata.msg" /></td> + <td colspan="4"><spring:message code="common.nodata.msg" /></td> </tr> </c:if> </tbody> 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 60) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleUpdt.jsp (revision 61) @@ -167,7 +167,7 @@  <c:set var="title"><spring:message code="comCopBbs.articleVO.updt.noticeAt" /></c:set> <li> - <strong class="board_label"><label for="noticeAt">${title}</label></strong> + <strong class="title"><label for="noticeAt">${title}</label></strong> <div class="content_type"> <div class="option"> <form:checkbox path="noticeAt" value="Y" /> @@ -178,7 +178,7 @@  <c:set var="title"><spring:message code="comCopBbs.articleVO.updt.secretAt" /></c:set> <li> - <strong class="board_label"><label for="secretAt">${title}</label></strong> + <strong class="title"><label for="secretAt">${title}</label></strong> <div class="content_type"> <div class="option"> <form:checkbox path="secretAt" value="Y" /> @@ -210,12 +210,12 @@ </li> <c:if test="${boardMasterVO.fileAtchPosblAt == 'Y'}"> <li> - <strong class="board_label">첨부파일</strong> - <div class="file_up"> + <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 type="hidden" id="atchFileId" name="atchFileId" value="${articleVO.atchFileId}" /> - <label for="egovComFileUploader" class="inputFile" title="업로드 할 파일을 선택해주세요">파일업로드</label> + <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> <div class="file_list" id="egovComFileList"></div> 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 60) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/bbs/EgovArticleDetail.jsp (revision 61) @@ -114,9 +114,9 @@ <div class="board_header"> <strong><c:out value="${result.nttSj}"/></strong> <div class="info"> <div class="by"> - <p><em class="blind"><spring:message code="table.reger" /></em><em><c:out value="${result.frstRegisterNm}"/></em></p> - <p><em class="blind"><spring:message code="table.regdate" /></em><c:out value="${result.frstRegisterPnttm}"/></p> - <p><em class="blind"><spring:message code="comCopBbs.articleVO.detail.inqireCo" /></em><c:out value="${result.inqireCo}"/></p> + <p><em><spring:message code="table.reger" /></em><c:out value="${result.frstRegisterNm}"/></p> + <p><em><spring:message code="table.regdate" /></em><c:out value="${result.frstRegisterPnttm}"/></p> + <p><em><spring:message code="comCopBbs.articleVO.detail.inqireCo" /></em><c:out value="${result.inqireCo}"/></p> </div> <div class="share"> <button type="button" title="출력" class="btn_print"><em class="blind">출력</em></button> @@ -134,52 +134,57 @@ <c:param name="authorType" value="user" /> </c:import> </c:if> + + <div class="xxx">ㅎㅎㅎ</div> <div class="board_content fr-view"> <c:out value="${fn:replace(result.nttCn , crlf , '<br/>')}" escapeXml="false" /> </div> </div> - <form name="formList" action="<c:url value='/cop/bbs/${reBbsId }/selectArticleList.do'/>" method="post" > - <div class="bottom_wrap center"> - <button type="submit" class="btn_l bg_basic" ><spring:message code="button.list" /></button> - </div> - <input name="bbsId" type="hidden" value="<c:out value="${searchVO.bbsId}" />"> - <input name="pageIndex" type="hidden" value="${searchVO.pageIndex}"> - <input name="searchKeyword" type="hidden" value="${searchVO.searchKeyword}"> - </form> - -  - <div class="btn"> - <c:if test="${result.ntcrId != 'anonymous'}"> -  - <form name="articleForm" action="<c:url value='/cop/bbs/updateArticleView.do'/>" method="post" > - <input type="submit" class="s_submit" value="<spring:message code="button.update" />" title="<spring:message code="title.update" /> <spring:message code="input.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'/>" > - <input type="submit" class="s_submit" value="<spring:message code="button.delete" />" title="<spring:message code="button.delete" /> <spring:message code="input.button" />" onclick="fn_egov_delete_article(this.form); return false;"> - <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 test="${boardMasterVO.replyPosblAt == 'Y' }"> - <form name="formReply" action="<c:url value='/cop/bbs/${reBbsId }/replyArticleView.do'/>" method="post" > - <input type="submit" class="s_submit" value="<spring:message code="button.reply" />"> - <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 style="clear:both;"></div>  <c:if test="${useComment == 'true'}"> <c:import url="/cop/cmt/${reBbsId }/selectArticleCommentList.do" charEncoding="utf-8"> </c:import> </c:if> + +  + <div class="bottom_wrap between"> + <div class="left"> + <form name="formList" action="<c:url value='/cop/bbs/${reBbsId }/selectArticleList.do'/>" method="post" > + <button type="submit" class="btn_l bg_basic" ><spring:message code="button.list" /></button> + <input name="bbsId" type="hidden" value="<c:out value="${searchVO.bbsId}" />"> + <input name="pageIndex" type="hidden" value="${searchVO.pageIndex}"> + <input name="searchKeyword" type="hidden" value="${searchVO.searchKeyword}"> + </form> + </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="input.button" />" ><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" /> <spring:message code="input.button" />" 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 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" />"><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> + </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 60) +++ base3.10/src/main/webapp/WEB-INF/jsp/egovframework/com/cop/cmt/EgovArticleCommentList.jsp (revision 61) @@ -28,30 +28,31 @@ <%-- <c:if test="${type == 'body'}"> --%> <%pageContext.setAttribute("crlf", "\r\n"); %>  +<div class="reply_wrap"> <c:set var="replyTitle">댓글</c:set> - <h3>${replyTitle} <c:out value="${resultCnt}"/></h3> - <div class="reply"> + <div class="title"><strong>${replyTitle} <em><span class="icon-say"></span><c:out value="${resultCnt}"/></em></strong></div> + <div class="reply_list"> <ul> <c:forEach var="result" items="${resultList}" varStatus="status"> <li> - <div class="top"> + <div class="by"> <strong><c:out value="${result.wrterNm}" /></strong> - <span class="bar">|</span> - <span class="date"><c:out value="${result.frstRegisterPnttm}" /></span> + <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> </div> <p class="txt"> <c:out value="${fn:replace(result.commentCn , crlf , '<br/>')}" escapeXml="false" /> </p> - <div class="bottom"> - <c:if test="${result.wrterId == sessionUniqId}"> - <span class="btn_s"><a href="javascript:fn_egov_selectCommentForupdt(${result.commentNo})" title="<spring:message code="button.update" /> <spring:message code="input.button" />"><spring:message code="button.update" /> </a></span>  - <span class="btn_s"><a href="javascript:fn_egov_deleteCommentList(${result.commentNo})" title="<spring:message code="button.delete" /> <spring:message code="input.button" />"><spring:message code="button.delete" /></a></span> - </c:if> - </div> + </li> </c:forEach> <c:if test="${fn:length(resultList) == 0}"> - <li> + <li class="nothing"> <p class="txt"><spring:message code="common.nocomment.msg" /></p> </li> </c:if> @@ -59,43 +60,32 @@ </div>  - <div class="paging"> - <ul><ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_egov_select_commentList"/></ul> + <div class="pagination <c:if test="${fn:length(resultList) == 0}">none</c:if>"> + <ul><ui:pagination paginationInfo="${paginationInfo}" type="user" jsFunction="fn_egov_select_commentList"/></ul> </div> - <form:form commandName="articleCommentVO" action="${pageContext.request.contextPath}/cop/cmt/${reBbsId }/insertArticleComment.do" method="post" onSubmit="fn_egov_insert_commentList(); return false;" style="float:left; clear:both;"> - <div class="wTableFrm" > - <table class="board_list top_line"> - <caption>${replyTitle } <spring:message code="title.create" /></caption> - <colgroup> - <col style="width: 16%;"><col style="width: ;"> - </colgroup> - <tbody> -  - <c:set var="title">댓글내용 </c:set> - <tr> - <th><label for="commentCn">${title } <span class="pilsu">*</span></label></th> - <td class="nopd"> - <form:textarea path="commentCn" title="${title} ${inputTxt}" cols="300" rows="20" cssClass="re_txt"/> - <div><form:errors path="commentCn" cssClass="error" /></div> - <c:choose> - <c:when test="${searchVO.commentNo == '' }"> - <span style="float:left;"><a href="javascript:fn_egov_insert_commentList(); " class="btn_s re_btn" title="<spring:message code="button.comment" /> <spring:message code="input.button" />"><spring:message code="button.comment" /><spring:message code="button.create" /></a></span> - </c:when> - <c:otherwise> - <span style="float:left;"><a href="javascript:fn_egov_updt_commentList(); " class="btn_s re_btn"title="<spring:message code="button.update" /> <spring:message code="input.button" />"><spring:message code="button.comment" /><spring:message code="button.update" /></a></span> - </c:otherwise> - </c:choose> - </td> - </tr> - </tbody> - </table> + <form:form commandName="articleCommentVO" action="${pageContext.request.contextPath}/cop/cmt/${reBbsId }/insertArticleComment.do" method="post" onSubmit="fn_egov_insert_commentList(); return false;"> +  + <div class="reply_write"> + <form:textarea path="commentCn" title="${title} ${inputTxt}" cssClass="textArea" placeholder="댓글내용을 입력해주세요"/> + <div><form:errors path="commentCn" cssClass="error" /></div> + <div class="bottom"> + <c:choose> + <c:when test="${searchVO.commentNo == '' }"> + <button onClick="location.href='javascript:fn_egov_insert_commentList();'" class="btn_m bg_lightgray" title="<spring:message code="button.comment" /> <spring:message code="input.button" />"><spring:message code="button.comment" /><spring:message code="button.create" /></button> + </c:when> + <c:otherwise> + <button onClick="location.href='javascript:fn_egov_updt_commentList();'" class="btn_m bg_lightgray" title="<spring:message code="button.update" /> <spring:message code="input.button" />"><spring:message code="button.comment" /><spring:message code="button.update" /></button> + </c:otherwise> + </c:choose> + </div> </div> + <input name="subPageIndex" type="hidden" value="<c:out value='${searchVO.subPageIndex}'/>"> <input name="commentNo" type="hidden" value="<c:out value='${searchVO.commentNo}'/>"> <input name="modified" type="hidden" value="false"> <input name="nttId" type="hidden" value="<c:out value="${result.nttId}" />"> <input name="bbsId" type="hidden" value="<c:out value="${boardMasterVO.bbsId}" />"> </form:form> - +</div> <%-- </c:if> --%> Index: base3.10/src/main/webapp/html/design/css/common.css =================================================================== --- base3.10/src/main/webapp/html/design/css/common.css (revision 60) +++ base3.10/src/main/webapp/html/design/css/common.css (revision 61) @@ -260,6 +260,7 @@ /*게시판 하단*/ .bottom_wrap { display:flex; padding-top:50px; position:relative; } +.bottom_wrap > div { display:flex; flex-wrap:wrap; } .bottom_wrap.center { justify-content: center; } .bottom_wrap.between { justify-content:space-between; } .bottom_wrap.right { justify-content:flex-end; } Index: base3.10/src/main/webapp/html/design/css/font.css =================================================================== --- base3.10/src/main/webapp/html/design/css/font.css (revision 60) +++ base3.10/src/main/webapp/html/design/css/font.css (revision 61) @@ -37,6 +37,15 @@ -moz-osx-font-smoothing: grayscale; } +.icon-say:before { + content: "\e918"; +} +.icon-lock:before { + content: "\e919"; +} +.icon-people:before { + content: "\e91a"; +} .icon-file-excel:before { content: "\e90d"; } @@ -106,6 +115,9 @@ .icon-search:before { content: "\e90a"; } +.icon-pencil:before { + content: "\e917"; +} .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 60) +++ base3.10/src/main/webapp/html/design/fonts/icomoon.svg (revision 61) @@ -28,8 +28,12 @@ <glyph unicode="" glyph-name="file-word" horiz-adv-x="768" d="M739.655 764.039l-167.767 167.767c-17.997 17.997-42.391 28.194-67.787 28.194h-408.121c-52.989-0.2-95.98-43.191-95.98-96.181v-831.837c0-52.991 42.991-95.984 95.982-95.984h575.889c52.991 0 95.982 42.993 95.982 95.984v664.071c-0.002 25.394-10.2 49.989-28.197 67.986zM664.071 703.851h-152.172v152.17l152.172-152.17zM95.98 31.984v831.835h319.937v-207.959c0-26.594 21.395-47.991 47.989-47.991h207.96v-575.887h-575.887zM536.096 477.139c-11.399 0-21.196-7.997-23.397-18.996-41.191-195.362-40.792-190.764-41.992-206.961-0.399 2.401-0.8 5.199-1.398 8.599-1.601 10.199 0.6-0.399-47.19 198.96-2.6 10.799-12.199 18.397-23.397 18.397h-26.596c-10.999 0-20.595-7.598-23.395-18.196-48.791-197.963-47.991-192.363-49.59-207.36-0.2 2.2-0.399 5.001-0.999 8.402-1.4 10.397-28.195 146.572-38.193 197.959-2.2 11.2-11.998 19.397-23.596 19.397h-33.592c-15.596 0-26.995-14.596-23.397-29.595 15.998-65.186 53.39-218.957 66.388-271.946 2.6-10.796 12.197-18.196 23.397-18.196h50.39c10.999 0 20.595 7.401 23.194 18.196l35.794 142.773c2.999 12.398 5 23.997 5.999 34.595l5.799-34.595c0.2-0.8 25.194-100.978 35.794-142.773 2.599-10.598 12.197-18.196 23.194-18.196h49.391c10.999 0 20.597 7.401 23.196 18.196 41.591 163.77 60.388 237.955 68.985 271.946 3.799 15.2-7.598 29.795-23.196 29.795h-31.592v-0.401z" /> <glyph unicode="" glyph-name="file-zip" horiz-adv-x="768" d="M739.655 764.238l-167.768 167.768c-17.997 17.997-42.391 28.194-67.787 28.194h-408.122c-52.987-0.2-95.979-43.191-95.979-96.182v-831.838c0-52.994 42.991-95.987 95.982-95.987h575.888c52.994 0 95.986 42.993 95.986 95.987v664.072c-0.005 25.394-10.204 49.99-28.201 67.986zM664.069 704.050h-152.172v152.17l152.172-152.17zM95.979 32.182v831.836h319.938v-207.959c0-26.594 21.392-47.991 47.986-47.991h207.962v-575.888l-575.886 0.002zM209.624 263.863l78.923 120.784h-71.374v28.137h112.778v-20.131l-78.694-120.784h79.609v-28.366h-121.244v20.36zM360.826 412.786h33.857v-169.283h-33.857v169.283zM436.309 412.786h55.589c37.517 0 66.342-13.038 66.342-53.072 0-38.661-29.054-56.047-65.425-56.047h-22.647v-60.163h-33.861v169.281zM490.528 330.432c23.332 0 34.542 9.838 34.542 29.281 0 19.674-12.356 26.309-35.687 26.309h-19.214v-55.589h20.36z" /> <glyph unicode="" glyph-name="cal" horiz-adv-x="964" d="M849.886-64h-735.976c-62.782 0-113.911 51.083-113.911 113.911v637.541c0 62.782 51.083 113.911 113.911 113.911h736.022c62.782 0 113.911-51.083 113.911-113.911v-637.541c-0.046-62.828-51.129-113.911-113.957-113.911zM113.911 704.127c-9.166 0-16.628-7.508-16.628-16.674v-637.541c0-9.166 7.462-16.674 16.628-16.674h736.022c9.166 0 16.628 7.508 16.628 16.674v637.541c0 9.212-7.462 16.674-16.628 16.674h-736.022zM337.265 794.592c0-7.232-5.85-13.082-13.035-13.082h-100.599c-7.186 0-13.035 5.85-13.035 13.082v152.372c0 7.232 5.85 13.082 13.035 13.082h100.599c7.186 0 13.035-5.85 13.035-13.082v-152.372zM753.249 794.592c0-7.232-5.85-13.082-13.035-13.082h-100.599c-7.186 0-13.035 5.85-13.035 13.082v152.372c0 7.232 5.85 13.082 13.035 13.082h100.599c7.186 0 13.035-5.85 13.035-13.082v-152.372zM333.626 432.915c0-14.417-11.7-26.117-26.117-26.117h-74.39c-14.417 0-26.117 11.7-26.117 26.117v74.436c0 14.417 11.7 26.117 26.117 26.117h74.39c14.417 0 26.117-11.7 26.117-26.117v-74.436zM545.234 432.915c0-14.417-11.7-26.117-26.117-26.117h-74.39c-14.417 0-26.117 11.7-26.117 26.117v74.436c0 14.417 11.7 26.117 26.117 26.117h74.39c14.417 0 26.117-11.7 26.117-26.117v-74.436zM756.842 432.915c0-14.417-11.7-26.117-26.117-26.117h-74.39c-14.417 0-26.117 11.7-26.117 26.117v74.436c0 14.417 11.7 26.117 26.117 26.117h74.39c14.417 0 26.117-11.7 26.117-26.117v-74.436zM333.626 230.013c0-14.417-11.7-26.117-26.117-26.117h-74.39c-14.417 0-26.117 11.7-26.117 26.117v74.39c0 14.417 11.7 26.117 26.117 26.117h74.39c14.417 0 26.117-11.7 26.117-26.117v-74.39zM545.234 230.013c0-14.417-11.7-26.117-26.117-26.117h-74.39c-14.417 0-26.117 11.7-26.117 26.117v74.39c0 14.417 11.7 26.117 26.117 26.117h74.39c14.417 0 26.117-11.7 26.117-26.117v-74.39zM756.842 230.013c0-14.417-11.7-26.117-26.117-26.117h-74.39c-14.417 0-26.117 11.7-26.117 26.117v74.39c0 14.417 11.7 26.117 26.117 26.117h74.39c14.417 0 26.117-11.7 26.117-26.117v-74.39z" /> -<glyph unicode="" glyph-name="trash" horiz-adv-x="896" d="M536 128h48c13.255 0 24 10.745 24 24v0 432c0 13.255-10.745 24-24 24v0h-48c-13.255 0-24-10.745-24-24v0-432c0-13.255 10.745-24 24-24v0zM864 800h-164.82l-68 113.4c-17.083 28.11-47.539 46.6-82.314 46.6-0.016 0-0.032 0-0.048 0h-201.637c-0.002 0-0.004 0-0.006 0-34.775 0-65.231-18.49-82.074-46.175l-0.24-0.425-68.040-113.4h-164.82c-17.673 0-32-14.327-32-32v0-32c0-17.673 14.327-32 32-32v0h32v-672c0-53.019 42.981-96 96-96v0h576c53.019 0 96 42.981 96 96v0 672h32c17.673 0 32 14.327 32 32v0 32c0 17.673-14.327 32-32 32v0zM343.68 858.18c2.136 3.511 5.941 5.82 10.286 5.82 0.012 0 0.024 0 0.036 0h187.998c0.004 0 0.009 0 0.014 0 4.345 0 8.15-2.309 10.256-5.767l0.030-0.053 34.92-58.18h-278.44zM736 32h-576v672h576zM312 128h48c13.255 0 24 10.745 24 24v0 432c0 13.255-10.745 24-24 24v0h-48c-13.255 0-24-10.745-24-24v0-432c0-13.255 10.745-24 24-24v0z" /> +<glyph unicode="" glyph-name="delete" horiz-adv-x="896" d="M536 128h48c13.255 0 24 10.745 24 24v0 432c0 13.255-10.745 24-24 24v0h-48c-13.255 0-24-10.745-24-24v0-432c0-13.255 10.745-24 24-24v0zM864 800h-164.82l-68 113.4c-17.083 28.11-47.539 46.6-82.314 46.6-0.016 0-0.032 0-0.048 0h-201.637c-0.002 0-0.004 0-0.006 0-34.775 0-65.231-18.49-82.074-46.175l-0.24-0.425-68.040-113.4h-164.82c-17.673 0-32-14.327-32-32v0-32c0-17.673 14.327-32 32-32v0h32v-672c0-53.019 42.981-96 96-96v0h576c53.019 0 96 42.981 96 96v0 672h32c17.673 0 32 14.327 32 32v0 32c0 17.673-14.327 32-32 32v0zM343.68 858.18c2.136 3.511 5.941 5.82 10.286 5.82 0.012 0 0.024 0 0.036 0h187.998c0.004 0 0.009 0 0.014 0 4.345 0 8.15-2.309 10.256-5.767l0.030-0.053 34.92-58.18h-278.44zM736 32h-576v672h576zM312 128h48c13.255 0 24 10.745 24 24v0 432c0 13.255-10.745 24-24 24v0h-48c-13.255 0-24-10.745-24-24v0-432c0-13.255 10.745-24 24-24v0z" /> <glyph unicode="" glyph-name="file" horiz-adv-x="892" d="M811.952 458.371c-6.798 6.638-18.323 6.369-24.881-0.312l-354.442-362.583c-36.77-37.605-85.595-58.339-137.441-58.339-52.195 0-101.223 20.981-138.117 59.007-75.979 78.412-74.868 206.623 2.535 285.761l432.128 442.041c44.163 45.063 120.411 44.976 164.457 0 46.203-47.307 46.203-124.216 0-171.473l-376.665-384.901c-14.808-15.091-40.023-14.852-54.504 0.465-15.2 16.173-14.539 42.594 1.503 59.007l296.096 302.465c6.79 6.936 6.667 18.069-0.24 24.896l-47.104 46.058c-6.667 6.609-18.316 6.5-24.874-0.24l-296.096-302.465c-53.509-54.737-54.773-143.956-2.832-199.005 26.718-28.287 62.58-43.858 101.1-43.858 37.481 0 72.704 14.91 99.161 41.94l376.672 384.966c84.295 86.227 84.295 226.551 0 312.763-41.214 42.187-96.060 65.434-154.464 65.434s-113.272-23.247-154.486-65.434l-432.128-442.012c-115.334-117.942-116.598-309.379-2.796-426.783 56.124-57.867 130.963-89.771 210.777-89.771 79.16 0 153.607 31.548 209.6 88.863l354.442 362.554c3.304 3.377 5.047 7.742 4.997 12.441 0 4.735-1.939 9.136-5.294 12.382l-47.104 46.131z" /> +<glyph unicode="" glyph-name="pencil" d="M864 960c88.364 0 160-71.634 160-160 0-36.020-11.91-69.258-32-96l-64-64-224 224 64 64c26.742 20.090 59.978 32 96 32zM64 224l-64-288 288 64 592 592-224 224-592-592zM715.578 596.422l-448-448-55.156 55.156 448 448 55.156-55.156z" /> +<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="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/js/froala_editor_script_custom.js =================================================================== --- base3.10/src/main/webapp/resource/editor/js/froala_editor_script_custom.js (revision 60) +++ base3.10/src/main/webapp/resource/editor/js/froala_editor_script_custom.js (revision 61) @@ -387,13 +387,11 @@ } // 파일 목록 생성 (사용자게시판) var defaultsDomUser = function(html) { - var dom = '<li id="'+html.fileId+'">' - + '<div class="file_wrap">' + var dom = '<div id="'+html.fileId+'" class="file_box">' + '<p class="filename">'+html.originFileNm+'</p>' - + '<button type="button" class="btn_ss bg_basic" title="파일 본문에 넣기">본문에 넣기</button>' - + '<button type="button" class="btn_delete btn_sq_s ml2" title="파일 삭제" >삭제</button>' + + '<button type="button" class="btn_inner widthauto" title="파일 본문에 넣기">본문에 넣기</button>' + + '<button type="button" class="btn_inner" title="파일 삭제" ><em class="blind">삭제</em><span class="icon-delete"></span></button>' + '</div>' - + '</li>' return dom; }

Add a comment

List

Delete comment