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

@ -4,23 +4,23 @@
<load target="css/Orange/layout.css" cond="$layout_info->colorset=='orange'" />
<load target="css/nGreenA/layout.css" cond="$layout_info->colorset=='ngreena'" />
<load target="css/nGreenB/layout.css" cond="$layout_info->colorset=='ngreenb'" />
<load target="../../common/js/jquery.min.js" index="-1" />
<load target="../../common/js/jquery.min.js" index="-1000000" />
<load target="js/layout.js" />
<div class="skip"><a href="#ct">Skip to Content</a></div>
<header class="lo_head">
<a href="{$layout_info->index_url}" class="btn_home">Home</a>
<a href="{$layout_info->index_url}" class="btn_home">Home</a>
<!--@if($layout_info->menu->main_menu->menu_srl)-->
<!--@if($act=='dispMenuMenu')-->
<a class="btn_menu" href="#" onclick="history.back(); return false;" title="돌아가기"><span class="b">Back</span></a>
<!--@else-->
<a class="btn_menu" href="{getUrl('act','dispMenuMenu','menu_srl',$layout_info->menu->main_menu->menu_srl)}" title="메뉴"><span class="m">Menu</span></a>
<!--@end-->
<!--@if($act=='dispMenuMenu')-->
<a class="btn_menu" href="#" onclick="history.back(); return false;" title="{$lang->cmd_back}"><span class="b">Back</span></a>
<!--@else-->
<a class="btn_menu" href="{getUrl('act','dispMenuMenu','menu_srl',$layout_info->menu->main_menu->menu_srl)}" title="{$lang->menu}"><span class="m">Menu</span></a>
<!--@end-->
<!--@end-->
<!--@if($layout_info->logo_image)-->
<h1 class="title"><a href="{$layout_info->index_url}" class="img"><img src="{$layout_info->logo_image}" alt="{$layout_info->index_title}" /></a></h1>
<h1 class="title"><a href="{$layout_info->index_url}" class="img"><img src="{$layout_info->logo_image}" alt="{$layout_info->index_title}"|cond="$layout_info->index_title" alt="{Context::getSiteTitle()}"|cond="!$layout_info->index_title && Context::getSiteTitle()" /></a></h1>
<!--@elseif($layout_info->index_title)-->
<h1 class="title"><span class="txt">{$layout_info->index_title}</span></h1>
<h1 class="title"><span class="txt">{$layout_info->index_title}</span></h1>
<!--@end-->
</header>
<hr class="head_hr" />
@ -28,25 +28,24 @@
{$content}
</section>
<footer class="lo_foot">
<ul class="link">
<!--@if($is_logged)-->
<li><a href="{getUrl('act','dispMemberLogout')}">{$lang->cmd_logout}</a></li>
<!--@elseif($act!='dispMemberLoginForm')-->
<li><a href="{getUrl('act','dispMemberLoginForm')}" >{$lang->cmd_login}</a></li>
<!--@end-->
<li><a href="{getUrl('m',0)}">PC</a></li>
<li class="lang off">
<a href="#" onclick="return false;" title="{$lang_type}">{$lang_supported[$lang_type]} <i class="icon_arr_draw"></i></a>
<ul class="lang_lst">
<!--@foreach($lang_supported as $key=>$val)-->
<li cond="$key != $lang_type"><a href="{getUrl('act',$oldact,'l',$key)}">{$val}</a></li>
<!--@end-->
</ul>
</li>
</ul>
<p class="cr">{$layout_info->footer_title}</p>
<ul class="link">
<!--@if($is_logged)-->
<li><a href="{getUrl('act','dispMemberLogout')}">{$lang->cmd_logout}</a></li>
<li><a href="{getUrl('act', 'dispMemberInfo')}">{$lang->cmd_view_member_info}</a></li>
<!--@elseif($act!='dispMemberLoginForm')-->
<li><a href="{getUrl('act','dispMemberLoginForm')}" >{$lang->cmd_login}...</a></li>
<!--@end-->
<li><a href="{getUrl('m',0)}">PC</a></li>
<li class="lang off" cond="count($lang_supported)>1">
<a href="#" onclick="return false;" title="{$lang_type}">{$lang_supported[$lang_type]} <i class="icon_arr_draw"></i></a>
<ul class="lang_lst">
<!--@foreach($lang_supported as $key=>$val)-->
<li cond="$key != $lang_type"><a href="{getUrl('act',$oldact,'l',$key)}">{$val}</a></li>
<!--@end-->
</ul>
</li>
</ul>
<p class="cr">{$layout_info->footer_title}</p>
</footer>
</body>
</html>