g5 merge 충돌 수정

adm/admin.head.php

@@ -103,17 +103,33 @@ function imageview(id, w, h)
                 $gnb_str .=  $href1 . $menu['menu'.$key][0][1] . $href2;
                 $gnb_str .=  print_menu1('menu'.$key, 1);
                 $gnb_str .=  "</li>";
-                if ($current_class) $current_class = ""; // 클래스 반복부여 방지
             }
             $gnb_str .= "</ul>";
             echo $gnb_str;
             ?>
         </nav>
-    </div>
 
+    </div>
 </header>
 
+<?php if($sub_menu) { ?>
+<ul id="lnb">
+<?php
+$menu_key = substr($sub_menu, 0, 3);
+$nl = '';
+foreach($menu['menu'.$menu_key] as $key=>$value) {
+    if($key > 0) {
+        if ($menu_key == substr($menu['menu'.$key][0][0], 0, 2)) echo 1;
+        echo $nl.'<li><a href="'.$value[2].'">'.$value[1].'</a></li>';
+        $nl = PHP_EOL;
+    }
+}
+?>
+</ul>
+<?php } ?>
+
 <div id="wrapper">
+
     <div id="container">
         <div id="text_size">
             <!-- font_resize('엘리먼트id', '제거할 class', '추가할 class'); -->

css/admin.css

@@ -74,6 +74,11 @@ h2.h2_frm {padding-top:15px}
 .gnb_js .gnb_grp_style:focus, .gnb_js .gnb_grp_style:hover {background:#484848 !important}
 .gnb_js .gnb_grp_div {border-top:1px solid #eee}
 
+#lnb {margin:0;padding:10px 15px;list-style:none;zoom:1}
+#lnb:after {display:block;visibility:hidden;clear:both;content:""}
+#lnb li {float:left}
+#lnb a {display:inline-block;padding:5px;font-size:0.95em;letter-spacing:-0.1em}
+
 /* 중간 레이아웃 */
 #wrapper {z-index:5;margin:20px 0;zoom:1}
 #wrapper:after {display:block;visibility:hidden;clear:both;content:""}

css/default.css

@@ -188,6 +188,7 @@ li.empty_list {padding:85px 0;text-align:center}
 
 /* 필수입력 */
 .required {background:url('../img/wrest.gif') #f7f7f7 top right no-repeat}
+textarea.required {background:url('../img/wrest.gif') #f7f7f7 top right no-repeat}
 
 /* 테이블 항목별 정의 */
 .td_board {width:120px;text-align:center}

skin/board/basic/style.css

@@ -207,7 +207,7 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa
 #bo_v_atc {min-height:200px;height:auto !important;height:200px}
 #bo_v_atc_title {position:absolute;font-size:0;line-height:0;overflow:hidden}
 
-#bo_v_img {margin:0 0 10px;width:100%;overflow:hidden:zoom:1}
+#bo_v_img {margin:0 0 10px;width:100%;overflow:hidden;zoom:1}
 #bo_v_img:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_v_img img {margin-bottom:20px;max-width:100%;height:auto}
 

skin/board/gallery/list.skin.php

@@ -44,6 +44,9 @@ include_once(G5_LIB_PATH.'/thumbnail.lib.php');
     <input type="hidden" name="page" value="<?php echo $page ?>">
     <input type="hidden" name="sw" value="">
 
+    <label for="chkall" class="sound_only">현재 페이지 게시물 전체</label>
+    <input type="checkbox" id="chkall" onclick="if (this.checked) all_checked(true); else all_checked(false);">
+
     <ul id="gall_ul">
         <?php for ($i=0; $i<count($list); $i++) {
             if($i>0 && ($i % $bo_gallery_cols == 0))

skin/board/gallery/style.css

@@ -197,7 +197,7 @@ html.no-overflowscrolling #autosave_pop {height:auto;max-height:10000px !importa
 #bo_v_atc {min-height:200px;height:auto !important;height:200px}
 #bo_v_atc_title {position:absolute;font-size:0;line-height:0;overflow:hidden}
 
-#bo_v_img {margin:0 0 10px;width:100%;overflow:hidden:zoom:1}
+#bo_v_img {margin:0 0 10px;width:100%;overflow:hidden;zoom:1}
 #bo_v_img:after {display:block;visibility:hidden;clear:both;content:""}
 #bo_v_img img {margin-bottom:20px;max-width:100%;height:auto}
 

skin/member/basic/style.css

@@ -59,7 +59,9 @@
 
 .mbskin .frm_info {}
 
-.mbskin .required {} /* 필수입력 */
+/* 필수입력 */
+.mbskin .required {}
+.mbskin textarea.required {}
 
 /* 테이블 항목별 정의 */
 .mbskin .td_board {}