diff options
| -rw-r--r-- | core/Controller.php | 2 | ||||
| -rw-r--r-- | plugins/Login/templates/header.tpl | 12 | ||||
| -rw-r--r-- | plugins/Login/templates/login.css | 5 |
3 files changed, 16 insertions, 3 deletions
diff --git a/core/Controller.php b/core/Controller.php index 3654c661e8..1f4867ae45 100644 --- a/core/Controller.php +++ b/core/Controller.php @@ -479,6 +479,8 @@ abstract class Piwik_Controller $view->isCustomLogo = Piwik_Config::getInstance()->branding['use_custom_logo']; $view->logoHeader = Piwik_API_API::getInstance()->getHeaderLogoUrl(); $view->logoLarge = Piwik_API_API::getInstance()->getLogoUrl(); + $view->logoSVG = Piwik_API_API::getInstance()->getSVGLogoUrl(); + $view->hasSVGLogo = Piwik_API_API::getInstance()->hasSVGLogo(); $view->enableFrames = Piwik_Config::getInstance()->General['enable_framed_pages'] || @Piwik_Config::getInstance()->General['enable_framed_logins']; diff --git a/plugins/Login/templates/header.tpl b/plugins/Login/templates/header.tpl index 095dc7b8fc..6b27f66710 100644 --- a/plugins/Login/templates/header.tpl +++ b/plugins/Login/templates/header.tpl @@ -41,10 +41,16 @@ {include file="CoreHome/templates/iframe_buster_body.tpl"} <div id="logo"> {if !$isCustomLogo}<a href="http://piwik.org" title="{$linkTitle}">{/if} + {if $hasSVGLogo} + <img src='{$logoSVG}' title="{$linkTitle}" alt="Piwik" width="240" style='margin-right: 20px' class="ie-hide" /> + <!--[if lt IE 9]> + {/if} <img src='{$logoLarge}' title="{$linkTitle}" alt="Piwik" width="240" style='margin-right:20px' /> - {if $isCustomLogo}{capture name='poweredByPiwik'} - <i><a href="http://piwik.org/" target="_blank">{$linkTitle}</a></i> - {/capture} + {if $hasSVGLogo}<![endif]-->{/if} + {if $isCustomLogo} + {capture name='poweredByPiwik'} + <i><a href="http://piwik.org/" target="_blank">{$linkTitle}</a></i> + {/capture} {/if} {if !$isCustomLogo}</a> <div class="description"><a href="http://piwik.org" title="{$linkTitle}">{$linkTitle}</a> diff --git a/plugins/Login/templates/login.css b/plugins/Login/templates/login.css index 3234903f57..4aa60469a2 100644 --- a/plugins/Login/templates/login.css +++ b/plugins/Login/templates/login.css @@ -220,3 +220,8 @@ a { float: left; margin-left: 16px; } + +/* IE < 9 will use this */ +html.old-ie .ie-hide { + display: none; +} |