Skip to content

Remove docs for Piwik 2 #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattab merged 2 commits into from
May 20, 2019
Merged

Remove docs for Piwik 2 #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44f2689
Update logo to the new Matomo logo
tsteur Nov 9, 2018
fe4b631
Remove docs for Piwik 2
tsteur Nov 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/helpers/Environment.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Binary file modified app/public/img/logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 14 additions & 2 deletions app/routes/page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
4 changes: 3 additions & 1 deletion app/templates/base.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand hidden-sm" href="{{ '/'|completeUrl }}"><img height="20" width="109" src="/img/logo.png"/></a>
<a class="navbar-brand hidden-sm" href="{{ '/'|completeUrl }}"><img height="20" width="124" src="/img/logo.png"/></a>
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
Expand All @@ -50,6 +50,7 @@
<a href="{{ '/support'|completeUrl }}">Support</a>
</li>
</ul>
{% if availablePiwikVersions|length > 1 %}
<ul class="nav navbar-nav pull-right">
<li>
<div id="quick-search-typeahead">
Expand All @@ -70,6 +71,7 @@
</div>
</li>
</ul>
{% endif %}
</div>
</div>
</div>
Expand Down