Skip to content
Browse files

# [#32412] protostar error page logo Thanks David Beuving

(Fix #2503)
  • Loading branch information...
1 parent a07d9b8 commit cb6e302164c1230b0f06026ff8642b0571837c45 David Beuving committed with infograf768 Nov 13, 2013
Showing with 25 additions and 11 deletions.
  1. +3 −0 installation/CHANGELOG
  2. +22 −11 templates/protostar/error.php
View
3 installation/CHANGELOG
@@ -25,6 +25,9 @@ $ -> Language fix or change
- -> Removed
! -> Note
+13-Nov-2013 Jean-Marie Simonet
+# [#32412] protostar error page logo Thanks David Beuving
+
12-Nov-2013 Jean-Marie Simonet
# [#32629] The media formfield is missing a space before the class attribute Thanks Thomas Hunziker
# [#32588] Joomla 3.2 JavaScript errors (Uncaught TypeError: undefined is not a function ) Thanks Jurian Even
View
33 templates/protostar/error.php
@@ -41,14 +41,18 @@
$user = JFactory::getUser();
-// Logo file
+// Logo file or site title param
if ($params->get('logoFile'))
{
- $logo = JUri::root() . $params->get('logoFile');
+ $logo = '<img src="'. JUri::root() . $params->get('logoFile') .'" alt="'. $sitename .'" />';
+}
+elseif ($params->get('sitetitle'))
+{
+ $logo = '<span class="site-title" title="'. $sitename .'">'. htmlspecialchars($params->get('sitetitle')) .'</span>';
}
else
{
- $logo = $this->baseurl . "/templates/" . $this->template . "/images/logo.png";
+ $logo = '<span class="site-title" title="'. $sitename .'">'. $sitename .'</span>';
}
?>
<!DOCTYPE html>
@@ -57,6 +61,20 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title><?php echo $this->title; ?> <?php echo htmlspecialchars($this->error->getMessage()); ?></title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <?php
+ // Use of Google Font
+ if ($params->get('googleFont'))
+ {
+ ?>
+ <link href='//fonts.googleapis.com/css?family=<?php echo $params->get('googleFontName');?>' rel='stylesheet' type='text/css' />
+ <style type="text/css">
+ h1,h2,h3,h4,h5,h6,.site-title{
+ font-family: '<?php echo str_replace('+', ' ', $params->get('googleFontName'));?>', sans-serif;
+ }
+ </style>
+ <?php
+ }
+ ?>
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template; ?>/css/template.css" type="text/css" />
<?php
@@ -76,13 +94,6 @@
<link rel="stylesheet" href="<?php echo $this->baseurl ?>/media/jui/css/bootstrap-rtl.css" type="text/css" />
<?php
}
- // Use of Google Font
- if ($params->get('googleFont'))
- {
- ?>
- <link href='//fonts.googleapis.com/css?family=<?php echo $params->get('googleFontName');?>' rel='stylesheet' type='text/css'>
- <?php
- }
?>
<link href="<?php echo $this->baseurl ?>/templates/<?php echo $this->template; ?>/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
<?php
@@ -134,7 +145,7 @@
<div class="header">
<div class="header-inner clearfix">
<a class="brand pull-left" href="<?php echo $this->baseurl; ?>">
- <img src="<?php echo $logo;?>" alt="<?php echo $sitename; ?>" />
+ <?php echo $logo;?>
</a>
<div class="header-search pull-right">
<?php

0 comments on commit cb6e302

Please sign in to comment.
Something went wrong with that request. Please try again.