Merge branch 'g5'

This commit is contained in:
chicpro
2014-02-11 14:01:25 +09:00
2 changed files with 4 additions and 2 deletions

View File

@ -119,7 +119,9 @@ $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;
if ($is_admin != 'super' && (!array_key_exists($value[0],$auth) || !strstr($auth[$value[0]], 'r')))
continue;
echo $nl.'<li><a href="'.$value[2].'">'.$value[1].'</a></li>';
$nl = PHP_EOL;
}

View File

@ -52,7 +52,7 @@ h3 {margin:0 20px}
#gnb_1dul:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_1dli {z-index:13;clear:both;zoom:1}
.gnb_1dli:after {display:block;visibility:hidden;clear:both;content:""}
.gnb_1dli a {display:block;float:left;width:110px;height:34px;color:#fff;font-weight:bold;text-decoration:none;line-height:2.8em}
.gnb_1dli a {display:block;float:left;width:120px;height:34px;color:#fff;font-weight:bold;text-decoration:none;line-height:2.8em}
.gnb_1dli a:focus, .gnb_1dli a:hover {text-decoration:none}
.gnb_2dul {float:left;width:auto}
.gnb_2dli {float:left}