From 4e487c9d26484b65335d09f213ff9de06480003d Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Fri, 11 Nov 2016 16:15:31 +1300
Subject: [PATCH] Add Piwik Version to the Title of the Installer pages, and on
the logo tooltip fixes #10371
---
plugins/Installation/View.php | 3 +++
plugins/Installation/templates/layout.twig | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/plugins/Installation/View.php b/plugins/Installation/View.php
index 82d24beb71..24db423dc7 100644
--- a/plugins/Installation/View.php
+++ b/plugins/Installation/View.php
@@ -7,6 +7,7 @@
*
*/
namespace Piwik\Plugins\Installation;
+use Piwik\Version;
/**
*
@@ -45,6 +46,8 @@ class View extends \Piwik\View
$this->previousPreviousModuleName = $this->steps[$this->currentStepId - 2];
}
+ $this->piwikVersion = Version::VERSION;
+
return parent::render();
}
}
diff --git a/plugins/Installation/templates/layout.twig b/plugins/Installation/templates/layout.twig
index 457837fe58..df9e7a538f 100644
--- a/plugins/Installation/templates/layout.twig
+++ b/plugins/Installation/templates/layout.twig
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta name="robots" content="noindex,nofollow">
- <title>Piwik › {{ 'Installation_Installation'|translate }}</title>
+ <title>Piwik {{ piwikVersion }} › {{ 'Installation_Installation'|translate }}</title>
<link rel="stylesheet" type="text/css" href="index.php?module=Installation&action=getInstallationCss"/>
<script type="text/javascript" src="index.php?module=Installation&action=getInstallationJs"></script>
@@ -16,7 +16,7 @@
<div class="header">
<div class="logo">
- <img src="plugins/Morpheus/images/logo.png"/>
+ <img title="Piwik {{ piwikVersion }} - {{ 'General_OpenSourceWebAnalytics'|translate|escape('html_attr') }}" src="plugins/Morpheus/images/logo.png"/>
<p>{{ 'General_OpenSourceWebAnalytics'|translate }}</p>
</div>
<div class="language-selector">
--
GitLab