Merge #1530 XEDITON에서 로고 텍스트 표시 by ehii

* pr/1530:
  logo_text

Conflicts:
	layouts/xedition/css/layout.css
This commit is contained in:
Kijin Sung 2015-10-08 15:03:06 +09:00
commit 142a183daf
2 changed files with 13 additions and 8 deletions

View file

@ -184,16 +184,14 @@
<block cond="$_magazine_header && $layout_info->logo_img_magazine">
{@ $_logo_img = $layout_info->logo_img_magazine}
</block>
<block cond="$_onepage_header && $layout_info->logo_img_transparent">
{@ $_logo_img = $layout_info->logo_img_transparent}
</block>
<a href="<!--@if($layout_info->logo_url)-->{$layout_info->logo_url}<!--@else-->{getUrl('')}<!--@end-->">
<!--@if($_logo_img)-->
<!--@if($_magazine_header)-->
<img src="{$layout_info->logo_img_magazine}" alt="{$layout_info->logo_text}" />
<!--@else-->
<block cond="$_onepage_header && $layout_info->logo_img_transparent">
{@ $_logo_img = $layout_info->logo_img_transparent}
</block>
<img src="{$_logo_img}" data-logo="{$layout_info->logo_img}"|cond="$_onepage_header && $layout_info->logo_img_transparent" alt="{$layout_info->logo_text}" />
<!--@endif-->
<img src="{$_logo_img}" data-logo="{$layout_info->logo_img}"|cond="$_onepage_header && $layout_info->logo_img_transparent" alt="{$layout_info->logo_text}" />
<!--@elseif($layout_info->logo_text)-->
{$layout_info->logo_text}
<!--@else-->
{@ $_logo_img = 'logo.png'}
<block cond="$_magazine_header">{@ $_logo_img = 'm_logo.png'}</block>