merge sandbox to trunk for 1.4.3.1

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7659 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
zero 2010-08-25 06:19:21 +00:00
parent 289973781a
commit 200d63636c
195 changed files with 8166 additions and 3576 deletions

View file

@ -1,15 +1,25 @@
<!--%import("mx.css")-->
<div class="eg hd">
<div class="hd">
<!--@if($layout_info->logo_image)-->
<h1 class="h1"><a href="{$layout_info->index_url}"><img src="{$layout_info->logo_image}" alt="{$layout_info->index_title}" /></a></h1>
<!--@elseif($layout_info->index_title)-->
<h1 class="h1"><a href="{$layout_info->index_url}">{$layout_info->index_title}</a></h1>
<!--@else-->
<h1 class="h1"><a href="{$layout_info->index_url}">Mobile XE</a></h1>
<!--@end-->
<!--@if($layout_info->menu->main_menu->menu_srl)-->
<div class="fr"><a href="{getUrl('act','dispMenuMenu','menu_srl',$layout_info->menu->main_menu->menu_srl)}" class="bn">{$lang->menu}</a></div>
<!--@if($act=='dispMenuMenu')-->
<div class="fr"><button type="button" class="muon" onclick="history.back()">{$lang->cmd_back}</button></div>
<!--@else-->
<div class="fr"><a href="{getUrl('act','dispMenuMenu','menu_srl',$layout_info->menu->main_menu->menu_srl)}" class="mu">Menu</a></div>
<!--@end-->
<!--@end-->
</div>
{$content}
<ul class="eg ft">
<ul class="ft">
<!--@if($is_logged)-->
<li class="fl"><a href="{getUrl('act','dispMemberLogout')}">{$lang->cmd_logout}</a></li>
<!--@else-->
<!--@elseif($act!='dispMemberLoginForm')-->
<li class="fl"><a href="{getUrl('act','dispMemberLoginForm')}">{$lang->cmd_login}</a></li>
<!--@end-->
<li class="fr"><a href="{getUrl('m',0)}">PC</a></li>