firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

merge

Browse Source
This commit is contained in:
whitedot
2012-12-27 17:32:04 +09:00
parent 12894d08dc 2b5c471bdb
commit ee344294d9
11 changed files with 85 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
adm/admin.head.php
View File

@ -100,13 +100,21 @@ function textarea_size(fld, size)
$href2 = '</a>';
}
$current_class = "";
<<<<<<< HEAD
if ((isset($sub_menu) && substr($sub_menu, 0, 2) == substr($menu['menu'.$key][0][0], 0, 2)) || defined('_ADMIN_INDEX_'))
=======
if (isset($sub_menu) && (substr($sub_menu, 0, 2) == substr($menu['menu'.$key][0][0], 0, 2) || $admin_index))
>>>>>>> 2b5c471bdb62542fc9cb8b6740a934c34e5de04b
$current_class = " gnb_1depth_on";
echo "<li class=\"gnb_1depth".$current_class."\">";
echo $href1 . $menu['menu'.$key][0][1] . $href2;
echo print_menu1('menu'.$key, 1);
echo "</li>";
<<<<<<< HEAD
if ($current_class || !defined('_ADMIN_INDEX_')) $current_class = ""; // 클래스 반복부여 방지
=======
if ($current_class || !$admin_index) $current_class = ""; // 클래스 반복부여 방지
>>>>>>> 2b5c471bdb62542fc9cb8b6740a934c34e5de04b
}
?>