merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -1,10 +1,8 @@
<load target="css/communication.css" />
<load target="js/communication.js" />
<div class="xc">
<div class="nav" cond="$is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl)">
<ul>
<li loop="$logged_info->menu_list => $key,$val" class="active"|cond="$key==$act">
<a href="{getUrl('act',$key)}"><span>{Context::getLang($val)}</span></a>
</li>
</ul>
</div>
<section class="xc">
<ul class="nav nav-tabs" cond="$is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl)">
<li loop="$logged_info->menu_list => $key,$val" class="active"|cond="$key==$act">
<a href="{getUrl('act',$key)}">{Context::getLang($val)}</a>
</li>
</ul>