From 44f2689a970ff0f67ef7fe0041ff57ee34a7092d Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Fri, 9 Nov 2018 16:20:34 +1300 Subject: [PATCH 1/2] Update logo to the new Matomo logo --- app/public/img/logo.png | Bin 3844 -> 3884 bytes app/templates/base.twig | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app/public/img/logo.png b/app/public/img/logo.png index 27205e2afaa45aa8e88616a4e82c74e984c6527a..bf4a543b6c2d0fe16a26bd56c6c68c5fbbb87196 100644 GIT binary patch literal 3884 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 literal 3844 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 - +
    From fe4b631ec95052a84dc58bc9b02b9c2325a5bb70 Mon Sep 17 00:00:00 2001 From: Thomas Steur Date: Wed, 14 Nov 2018 08:09:24 +1300 Subject: [PATCH 2/2] Remove docs for Piwik 2 --- app/helpers/Environment.php | 2 +- app/routes/page.php | 16 ++++++++++++++-- app/templates/base.twig | 2 ++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/helpers/Environment.php b/app/helpers/Environment.php index a5986779d..20ac0e1d1 100644 --- a/app/helpers/Environment.php +++ b/app/helpers/Environment.php @@ -97,7 +97,7 @@ public static function completeUrl($path) // returns the piwik versions that can be chosen via the selector public static function getAvailablePiwikVersions() { - return range(2, LATEST_PIWIK_DOCS_VERSION); + return range(3, LATEST_PIWIK_DOCS_VERSION); } public static function getPiwikVersion() diff --git a/app/routes/page.php b/app/routes/page.php index 1a4dee240..279f7eee1 100644 --- a/app/routes/page.php +++ b/app/routes/page.php @@ -33,11 +33,23 @@ function initView($app) { $app->hook('slim.before.dispatch', function () use ($app) { $app->view->setData('urlIfAvailableInNewerVersion', false); + $availableVersions = Environment::getAvailablePiwikVersions(); + if (!Environment::isLatestPiwikVersion()) { - $app->view->setData('urlIfAvailableInNewerVersion', getUrlIfDocumentIsAvailableInPiwikVersion($app, LATEST_PIWIK_DOCS_VERSION)); + $matomoVersion = Environment::getPiwikVersion(); + $alternativeUrl = getUrlIfDocumentIsAvailableInPiwikVersion($app, LATEST_PIWIK_DOCS_VERSION); + + if (in_array($matomoVersion, $availableVersions)) { + $app->view->setData('urlIfAvailableInNewerVersion', $alternativeUrl); + } else { + // redirect to newest version + //$app->response->redirect($alternativeUrl, 301); + // exit; + $app->view->setData('urlIfAvailableInNewerVersion', $alternativeUrl); + } } - $app->view->setData('availablePiwikVersions', Environment::getAvailablePiwikVersions()); + $app->view->setData('availablePiwikVersions', $availableVersions); $app->view->setData('selectedPiwikVersion', Environment::getPiwikVersion()); $app->view->setData('latestPiwikDocsVersion', LATEST_PIWIK_DOCS_VERSION); $app->view->setData('revision', Git::getCurrentShortRevision()); diff --git a/app/templates/base.twig b/app/templates/base.twig index b44713c99..8636925f2 100644 --- a/app/templates/base.twig +++ b/app/templates/base.twig @@ -50,6 +50,7 @@ Support
+ {% if availablePiwikVersions|length > 1 %}
  • @@ -70,6 +71,7 @@
+ {% endif %}