update Piwik to version 2.16 (fixes #91)
This commit is contained in:
oliver
parent
296343bf3b
commit
d885a4baa9
5833 changed files with 418860 additions and 226988 deletions
|
|
@ -1,36 +1,56 @@
|
|||
<!DOCTYPE html>
|
||||
<html>
|
||||
<html id="ng-app" ng-app="piwikApp">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Piwik › {{ 'CoreUpdater_UpdateTitle'|translate }}</title>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=EDGE,chrome=1"/>
|
||||
<meta name="viewport" content="initial-scale=1.0" />
|
||||
<meta name="robots" content="noindex,nofollow">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="libs/jquery/themes/base/jquery-ui.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="libs/jquery/themes/base/jquery-ui.min.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="index.php?module=Installation&action=getBaseCss"/>
|
||||
<link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/simple_structure.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="plugins/Morpheus/stylesheets/simple_structure.css"/>
|
||||
<link rel="stylesheet" type="text/css" href="plugins/CoreHome/stylesheets/jquery.ui.autocomplete.css" />
|
||||
<link rel="stylesheet" type="text/css" href="plugins/CoreUpdater/stylesheets/updateLayout.css" />
|
||||
|
||||
<script type="text/javascript" src="libs/jquery/jquery.js"></script>
|
||||
<script type="text/javascript" src="libs/jquery/jquery-ui.js"></script>
|
||||
<script type="text/javascript" src="libs/bower_components/jquery/dist/jquery.min.js"></script>
|
||||
<script type="text/javascript" src="libs/bower_components/jquery-ui/ui/minified/jquery-ui.min.js"></script>
|
||||
<script type="text/javascript" src="plugins/CoreHome/javascripts/donate.js"></script>
|
||||
<script type="text/javascript" src="plugins/CoreUpdater/javascripts/updateLayout.js"></script>
|
||||
<script type="text/javascript">{{ getJavascriptTranslations()|raw }}</script>
|
||||
{% if 'General_LayoutDirection'|translate =='rtl' %}
|
||||
<link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/stylesheets/rtl.css"/>
|
||||
{% endif %}
|
||||
|
||||
<link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
|
||||
<script type="text/javascript" src="libs/bower_components/angular/angular.min.js"></script>
|
||||
<script type="text/javascript" src="libs/bower_components/angular-sanitize/angular-sanitize.js"></script>
|
||||
<script type="text/javascript" src="libs/bower_components/angular-animate/angular-animate.js"></script>
|
||||
<script type="text/javascript" src="libs/bower_components/angular-cookies/angular-cookies.js"></script>
|
||||
<script type="text/javascript" src="libs/bower_components/ngDialog/js/ngDialog.min.js"></script>
|
||||
<script type="text/javascript" src="plugins/CoreHome/angularjs/common/services/service.module.js"></script>
|
||||
<script type="text/javascript" src="plugins/CoreHome/angularjs/common/filters/filter.module.js"></script>
|
||||
<script type="text/javascript" src="plugins/CoreHome/angularjs/common/filters/translate.js"></script>
|
||||
<script type="text/javascript" src="plugins/CoreHome/angularjs/common/directives/directive.module.js"></script>
|
||||
<script type="text/javascript" src="plugins/CoreHome/angularjs/common/directives/focus-anywhere-but-here.js"></script>
|
||||
<script type="text/javascript" src="plugins/CoreHome/angularjs/piwikApp.config.js"></script>
|
||||
<script type="text/javascript" src="plugins/CoreHome/angularjs/piwikApp.js"></script>
|
||||
<script type="text/javascript" src="plugins/Installation/javascripts/installation.js"></script>
|
||||
|
||||
<script type="text/javascript">{{ getJavascriptTranslations()|raw }}</script>
|
||||
|
||||
{% include "@CoreHome/_favicon.twig" %}
|
||||
</head>
|
||||
<body id="simple">
|
||||
<div id="contentsimple">
|
||||
<div id="title">
|
||||
<img title='Piwik' alt="Piwik" src="plugins/Morpheus/images/logo-header.png" style="margin-left:10px;"/>
|
||||
<span id="subh1"> # {{ 'General_OpenSourceWebAnalytics'|translate }}</span>
|
||||
</div>
|
||||
<!--[if lt IE 9 ]>
|
||||
<body id="simple" ng-app="app" class="old-ie"> <![endif]-->
|
||||
<!--[if (gte IE 9)|!(IE)]><!-->
|
||||
<body id="simple" ng-app="app"><!--<![endif]-->
|
||||
|
||||
<div class="logo">
|
||||
<img title="Piwik" alt="Piwik" src="{{ logoHeader }}"/>
|
||||
<br/>
|
||||
{{ 'General_OpenSourceWebAnalytics'|translate }}
|
||||
</div>
|
||||
|
||||
<div class="box">
|
||||
{% block content %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -2,41 +2,49 @@
|
|||
{% import '@CorePluginsAdmin/macros.twig' as pluginsMacro %}
|
||||
|
||||
{% block content %}
|
||||
<br/>
|
||||
<p><strong>{{ 'CoreUpdater_ThereIsNewVersionAvailableForUpdate'|translate }}</strong></p>
|
||||
|
||||
{% if can_auto_update %}
|
||||
<p>{{ 'CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage'|translate(piwik_new_version) }}</p>
|
||||
{% else %}
|
||||
<p>{{ 'Installation_SystemCheckAutoUpdateHelp'|translate }}</p>
|
||||
<p>{{ 'CoreUpdater_YouMustDownloadPackageOrFixPermissions'|translate(piwik_new_version) }}
|
||||
{{ makeWritableCommands|raw }}
|
||||
</p>
|
||||
{% endif %}
|
||||
<div class="header">
|
||||
<h1>{{ 'CoreUpdater_ThereIsNewVersionAvailableForUpdate'|translate }}</h1>
|
||||
</div>
|
||||
|
||||
{% if incompatiblePlugins %}
|
||||
<p>{{ 'CoreUpdater_IncompatbilePluginsWillBeDisabledInfo'|translate(piwik_new_version) }}</p>
|
||||
<div class="content">
|
||||
|
||||
<ul style="list-style: disc;">
|
||||
{% for plugin in incompatiblePlugins %}
|
||||
<li>{{ pluginsMacro.missingRequirementsInfo(plugin.getPluginName, plugin.getInformation, plugin.getMissingDependencies(piwik_new_version), marketplacePlugins) }}</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
<p> </p>
|
||||
{% endif %}
|
||||
{% if can_auto_update %}
|
||||
<p>{{ 'CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage'|translate(piwik_new_version) }}</p>
|
||||
{% else %}
|
||||
<p>{{ 'Installation_SystemCheckAutoUpdateHelp'|translate }}</p>
|
||||
<p>{{ 'CoreUpdater_YouMustDownloadPackageOrFixPermissions'|translate(piwik_new_version) }}
|
||||
{{ makeWritableCommands|raw }}
|
||||
</p>
|
||||
{% endif %}
|
||||
|
||||
{% if can_auto_update %}
|
||||
<form id="oneclickupdate" action="index.php">
|
||||
<input type="hidden" name="module" value="CoreUpdater"/>
|
||||
<input type="hidden" name="action" value="oneClickUpdate"/>
|
||||
<input id="updateAutomatically" type="submit" class="btn btn-lg" value="{{ 'CoreUpdater_UpdateAutomatically'|translate }}"/>
|
||||
{% endif %}
|
||||
<a class="btn btn-lg"
|
||||
href="{{ piwik_latest_version_url }}?cb={{ piwik_new_version }}">{{ 'CoreUpdater_DownloadX'|translate(piwik_new_version) }}</a><br/>
|
||||
{% if can_auto_update %}
|
||||
</form>
|
||||
{% endif %}
|
||||
|
||||
{% if incompatiblePlugins %}
|
||||
<p>{{ 'CoreUpdater_IncompatbilePluginsWillBeDisabledInfo'|translate(piwik_new_version) }}</p>
|
||||
|
||||
<ul>
|
||||
{% for plugin in incompatiblePlugins %}
|
||||
<li>{{ pluginsMacro.missingRequirementsInfo(plugin.getPluginName, plugin.getInformation, plugin.getMissingDependencies(piwik_new_version), marketplacePlugins) }}</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
|
||||
<div class="footer">
|
||||
<a href="index.php">« {{ 'General_BackToPiwik'|translate }}</a>
|
||||
</div>
|
||||
|
||||
{% if can_auto_update %}
|
||||
<form id="oneclickupdate" action="index.php">
|
||||
<input type="hidden" name="module" value="CoreUpdater"/>
|
||||
<input type="hidden" name="action" value="oneClickUpdate"/>
|
||||
<input type="submit" class="submit" value="{{ 'CoreUpdater_UpdateAutomatically'|translate }}"/>
|
||||
{% endif %}
|
||||
<a style="margin-left:50px;" class="submit button"
|
||||
href="{{ piwik_latest_version_url }}?cb={{ piwik_new_version }}">{{ 'CoreUpdater_DownloadX'|translate(piwik_new_version) }}</a><br/>
|
||||
{% if can_auto_update %}
|
||||
</form>
|
||||
{% endif %}
|
||||
<br/>
|
||||
<a href="index.php">« {{ 'General_BackToPiwik'|translate }}</a>
|
||||
{% endblock %}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,26 +0,0 @@
|
|||
{% extends '@CoreUpdater/layout.twig' %}
|
||||
|
||||
{% block content %}
|
||||
<br/>
|
||||
{% for message in feedbackMessages %}
|
||||
<p>{{ message }}</p>
|
||||
{% endfor %}
|
||||
|
||||
{% if coreError %}
|
||||
<br/>
|
||||
<br/>
|
||||
<div class="error"><img src="plugins/Zeitgeist/images/error_medium.png"/> {{ coreError }}</div>
|
||||
<br/>
|
||||
<br/>
|
||||
<div class="warning">
|
||||
<img src="plugins/Zeitgeist/images/warning_medium.png"/>
|
||||
{{ 'CoreUpdater_UpdateHasBeenCancelledExplanation'|translate("<br /><br />","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/update/'>","</a>")|raw }}
|
||||
</div>
|
||||
<br/>
|
||||
<br/>
|
||||
{% endif %}
|
||||
|
||||
<form action="index.php">
|
||||
<input type="submit" class="submit" value="{{ 'General_ContinueToPiwik'|translate }}"/>
|
||||
</form>
|
||||
{% endblock %}
|
||||
|
|
@ -4,75 +4,82 @@
|
|||
{% endset %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
{% if coreError %}
|
||||
<br/>
|
||||
<br/>
|
||||
<div class="error">
|
||||
<img src="plugins/Zeitgeist/images/error_medium.png"/> {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }}
|
||||
{% for message in errorMessages %}
|
||||
<pre>{{ message }}</pre>
|
||||
<br/>
|
||||
{% endfor %}
|
||||
<div class="header">
|
||||
<h1>{{ 'CoreUpdater_UpdateErrorTitle'|translate }}</h1>
|
||||
</div>
|
||||
<br/>
|
||||
<p>{{ 'CoreUpdater_HelpMessageIntroductionWhenError'|translate }}
|
||||
<ul>
|
||||
<li>{{ helpMessage }}</li>
|
||||
</ul>
|
||||
</p>
|
||||
<p>{{ 'CoreUpdater_ErrorDIYHelp'|translate }}
|
||||
<ul>
|
||||
<li>{{ 'CoreUpdater_ErrorDIYHelp_1'|translate }}</li>
|
||||
<li>{{ 'CoreUpdater_ErrorDIYHelp_2'|translate }}</li>
|
||||
<li>{{ 'CoreUpdater_ErrorDIYHelp_3'|translate }} <a href='https://piwik.org/faq/how-to-update/#faq_179' target='_blank'>(see FAQ)</a></li>
|
||||
<li>{{ 'CoreUpdater_ErrorDIYHelp_4'|translate }}</li>
|
||||
<li>{{ 'CoreUpdater_ErrorDIYHelp_5'|translate }}</li>
|
||||
</ul>
|
||||
</p>
|
||||
{% else %}
|
||||
{% if warningMessages|length > 0 %}
|
||||
<div class="warning">
|
||||
<p><img src="plugins/Zeitgeist/images/warning_medium.png"/> {{ 'CoreUpdater_WarningMessages'|translate }}</p>
|
||||
{% for message in warningMessages %}
|
||||
<pre>{{ message }}</pre>
|
||||
<br/>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if errorMessages|length > 0 %}
|
||||
<div class="warning">
|
||||
<p><img src="plugins/Zeitgeist/images/error_medium.png"/> {{ 'CoreUpdater_ErrorDuringPluginsUpdates'|translate }}</p>
|
||||
<div class="content">
|
||||
<div class="alert alert-danger">
|
||||
{{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }}
|
||||
{% for message in errorMessages %}
|
||||
<pre>{{ message }}</pre>
|
||||
<br/>
|
||||
<br/><strong>{{ message|striptags }}</strong>
|
||||
{% endfor %}
|
||||
|
||||
{% if deactivatedPlugins is defined and deactivatedPlugins|length > 0 %}
|
||||
{% set listOfDeactivatedPlugins=deactivatedPlugins|join(', ') %}
|
||||
<p style="color:red;">
|
||||
<img src="plugins/Zeitgeist/images/error_medium.png"/>
|
||||
{{ 'CoreUpdater_WeAutomaticallyDeactivatedTheFollowingPlugins'|translate(listOfDeactivatedPlugins) }}
|
||||
</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if errorMessages|length > 0 or warningMessages|length > 0 %}
|
||||
<br/>
|
||||
<p>{{ 'CoreUpdater_HelpMessageIntroductionWhenWarning'|translate }}
|
||||
<p>{{ 'CoreUpdater_HelpMessageIntroductionWhenError'|translate }}</p>
|
||||
<ul>
|
||||
<li>{{ helpMessage }}</li>
|
||||
</ul>
|
||||
</p>
|
||||
{% else %}
|
||||
<p class="success">{{ 'CoreUpdater_PiwikHasBeenSuccessfullyUpgraded'|translate }}</p>
|
||||
<div id="donate-form-container">
|
||||
{% include "@CoreHome/_donate.twig" %}
|
||||
<p>{{ 'CoreUpdater_ErrorDIYHelp'|translate }}</p>
|
||||
<ul>
|
||||
<li>{{ 'CoreUpdater_ErrorDIYHelp_1'|translate }}</li>
|
||||
<li>{{ 'CoreUpdater_ErrorDIYHelp_2'|translate }}</li>
|
||||
<li>{{ 'CoreUpdater_ErrorDIYHelp_3'|translate }} <a href='https://piwik.org/faq/how-to-update/#faq_179' rel='noreferrer' target='_blank'>(see FAQ)</a></li>
|
||||
<li>{{ 'CoreUpdater_ErrorDIYHelp_4'|translate }}</li>
|
||||
<li>{{ 'CoreUpdater_ErrorDIYHelp_5'|translate }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
{% else %}
|
||||
|
||||
{% if errorMessages|length == 0 and warningMessages|length == 0 %}
|
||||
<div class="header">
|
||||
<h1>{{ 'CoreUpdater_PiwikHasBeenSuccessfullyUpgraded'|translate }}</h1>
|
||||
</div>
|
||||
{% endif %}
|
||||
<form action="index.php">
|
||||
<input type="submit" class="submit" value="{{ 'General_ContinueToPiwik'|translate }}"/>
|
||||
</form>
|
||||
|
||||
<div class="content">
|
||||
|
||||
{% if warningMessages|length > 0 %}
|
||||
<div class="alert alert-warning">
|
||||
<p>{{ 'CoreUpdater_WarningMessages'|translate }}</p>
|
||||
{% for message in warningMessages %}
|
||||
<br/><strong>{{ message|striptags }}</strong>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if errorMessages|length > 0 %}
|
||||
<div class="alert alert-warning">
|
||||
<p>{{ 'CoreUpdater_ErrorDuringPluginsUpdates'|translate }}</p>
|
||||
{% for message in errorMessages %}
|
||||
<br/><strong>{{ message|striptags }}</strong>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% if deactivatedPlugins is defined and deactivatedPlugins|length > 0 %}
|
||||
{% set listOfDeactivatedPlugins=deactivatedPlugins|join(', ') %}
|
||||
<div class="alert alert-danger">
|
||||
{{ 'CoreUpdater_WeAutomaticallyDeactivatedTheFollowingPlugins'|translate(listOfDeactivatedPlugins) }}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% if errorMessages|length > 0 or warningMessages|length > 0 %}
|
||||
<p>{{ 'CoreUpdater_HelpMessageIntroductionWhenWarning'|translate }}</p>
|
||||
<ul>
|
||||
<li>{{ helpMessage }}</li>
|
||||
</ul>
|
||||
{% else %}
|
||||
<div id="donate-form-container">
|
||||
{% include "@CoreHome/_donate.twig" %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
|
||||
<div class="footer">
|
||||
<a href="index.php">{{ 'General_ContinueToPiwik'|translate }}</a>
|
||||
</div>
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -1,55 +0,0 @@
|
|||
{% autoescape false %}
|
||||
{% set helpMessage %}{{- 'CoreUpdater_HelpMessageContent'|translate('[',']',"\n\n *") }}{% endset %}
|
||||
{% if coreError %}
|
||||
[X] {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }}
|
||||
|
||||
{% for message in errorMessages %}
|
||||
* {{ message }}
|
||||
{% endfor %}
|
||||
|
||||
{{ 'CoreUpdater_HelpMessageIntroductionWhenError'|translate }}
|
||||
|
||||
* {{ helpMessage }}
|
||||
|
||||
{{ 'CoreUpdater_ErrorDIYHelp'|translate }}
|
||||
* {{ 'CoreUpdater_ErrorDIYHelp_1'|translate }}
|
||||
* {{ 'CoreUpdater_ErrorDIYHelp_2'|translate }}
|
||||
* {{ 'CoreUpdater_ErrorDIYHelp_3'|translate }}
|
||||
* {{ 'CoreUpdater_ErrorDIYHelp_4'|translate }}
|
||||
* {{ 'CoreUpdater_ErrorDIYHelp_5'|translate }}
|
||||
|
||||
{% else %}
|
||||
{% if warningMessages|length > 0 %}
|
||||
[!] {{ 'CoreUpdater_WarningMessages'|translate }}
|
||||
|
||||
{% for message in warningMessages -%}
|
||||
* {{ message }}
|
||||
{%- endfor %}
|
||||
{%- endif %}
|
||||
{% if errorMessages|length > 0 -%}
|
||||
|
||||
[X] {{ 'CoreUpdater_ErrorDuringPluginsUpdates'|translate }}
|
||||
|
||||
{% for message in errorMessages %}
|
||||
* {{ message }}
|
||||
{% endfor %}
|
||||
|
||||
{% if deactivatedPlugins|length > 0 -%}
|
||||
{% set listOfDeactivatedPlugins %}{{ deactivatedPlugins|implode(', ') }}{% endset %}
|
||||
|
||||
[!] {{ 'CoreUpdater_WeAutomaticallyDeactivatedTheFollowingPlugins'|translate(listOfDeactivatedPlugins) }}
|
||||
{% endif %}
|
||||
|
||||
{% endif %}
|
||||
|
||||
{% if errorMessages|length > 0 or warningMessages|length > 0 %}
|
||||
{{ 'CoreUpdater_HelpMessageIntroductionWhenWarning'|translate }}
|
||||
|
||||
* {{ helpMessage }}
|
||||
{% else %}
|
||||
*** {{ 'CoreUpdater_PiwikHasBeenSuccessfullyUpgraded'|translate }} ***
|
||||
{% endif %}
|
||||
|
||||
{% endif %}
|
||||
{% endautoescape %}
|
||||
|
||||
|
|
@ -1,100 +1,99 @@
|
|||
{% extends '@CoreUpdater/layout.twig' %}
|
||||
|
||||
{% block content %}
|
||||
{% spaceless %}
|
||||
<span style="float:right;">{{ postEvent('Template.topBar')|raw }}</span>
|
||||
{% set helpMessage %}
|
||||
{{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=http://piwik.org/faq/">','</a>','</li><li>')|raw }}
|
||||
{% endset %}
|
||||
|
||||
{% if coreError %}
|
||||
<br/>
|
||||
<br/>
|
||||
<div class="error">
|
||||
<img src="plugins/Zeitgeist/images/error_medium.png"/> {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }}
|
||||
{% for message in errorMessages %}
|
||||
<pre>{{ message|raw }}</pre>
|
||||
{% endfor %}
|
||||
</div>
|
||||
<br/>
|
||||
<p>{{ 'CoreUpdater_HelpMessageIntroductionWhenError'|translate }}
|
||||
<ul>
|
||||
<li>{{ helpMessage|raw }}</li>
|
||||
</ul>
|
||||
</p>
|
||||
{% else %}
|
||||
{% if coreToUpdate or pluginNamesToUpdate|length > 0 %}
|
||||
<p style='font-size:110%;padding-top:1em;'><strong id='titleUpdate'>{{ 'CoreUpdater_DatabaseUpgradeRequired'|translate }}</strong></p>
|
||||
<div class="header">
|
||||
<h1>{{ 'CoreUpdater_DatabaseUpgradeRequired'|translate }}</h1>
|
||||
<p>{{ 'CoreUpdater_YourDatabaseIsOutOfDate'|translate }}</p>
|
||||
{% if coreToUpdate %}
|
||||
<p>{{ 'CoreUpdater_PiwikWillBeUpgradedFromVersionXToVersionY'|translate(current_piwik_version,new_piwik_version) }}</p>
|
||||
{% endif %}
|
||||
{{ postEvent('Template.topBar')|raw }}
|
||||
</div>
|
||||
|
||||
{% if pluginNamesToUpdate|length > 0 %}
|
||||
{% set listOfPlugins=pluginNamesToUpdate|join(', ') %}
|
||||
<p>{{ 'CoreUpdater_TheFollowingPluginsWillBeUpgradedX'|translate(listOfPlugins) }}</p>
|
||||
{% endif %}
|
||||
<h3 id='titleUpdate'>{{ 'CoreUpdater_NoteForLargePiwikInstances'|translate }}</h3>
|
||||
{% if isMajor %}
|
||||
<p class="warning normalFontSize">
|
||||
{{ 'CoreUpdater_MajorUpdateWarning1'|translate }}<br/>
|
||||
{{ 'CoreUpdater_MajorUpdateWarning2'|translate }}
|
||||
</p>
|
||||
{% endif %}
|
||||
<ul>
|
||||
<li>{{ 'CoreUpdater_TheUpgradeProcessMayFailExecuteCommand'|translate(commandUpgradePiwik)|raw }}</li>
|
||||
<li>{{ 'CoreUpdater_HighTrafficPiwikServerEnableMaintenance'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=http%3A%2F%2Fpiwik.org%2Ffaq%2Fhow-to%2F%23faq_111">', '</a>')|raw }}</li>
|
||||
<li>{{ 'CoreUpdater_YouCouldManuallyExecuteSqlQueries'|translate }}<br/>
|
||||
<a href="#titleUpdate" id="showSql" style="margin-left:20px;">› {{ 'CoreUpdater_ClickHereToViewSqlQueries'|translate }}</a>
|
||||
<div class="content text-left">
|
||||
|
||||
{% set helpMessage %}
|
||||
{{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=http://piwik.org/faq/">','</a>','</li><li>')|raw }}
|
||||
{% endset %}
|
||||
|
||||
{% if coreError %}
|
||||
<div class="alert alert-danger">
|
||||
{{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }}
|
||||
{% for message in errorMessages %}
|
||||
<br/><strong>{{ message|raw }}</strong>
|
||||
{% endfor %}
|
||||
</div>
|
||||
<p>{{ 'CoreUpdater_HelpMessageIntroductionWhenError'|translate }}</p>
|
||||
<ul>
|
||||
<li>{{ helpMessage|raw }}</li>
|
||||
</ul>
|
||||
{% else %}
|
||||
|
||||
{% if coreToUpdate or pluginNamesToUpdate|length > 0 or dimensionsToUpdate|length > 0 %}
|
||||
{% if coreToUpdate %}
|
||||
<p>{{ 'CoreUpdater_PiwikWillBeUpgradedFromVersionXToVersionY'|translate(current_piwik_version,new_piwik_version) }}</p>
|
||||
{% endif %}
|
||||
|
||||
{% if pluginNamesToUpdate|length > 0 %}
|
||||
{% set listOfPlugins=pluginNamesToUpdate|join(', ') %}
|
||||
<p>{{ 'CoreUpdater_TheFollowingPluginsWillBeUpgradedX'|translate(listOfPlugins) }}</p>
|
||||
{% endif %}
|
||||
|
||||
{% if dimensionsToUpdate|length > 0 %}
|
||||
{% set listOfDimensions=dimensionsToUpdate|join(', ') %}
|
||||
<p>{{ 'CoreUpdater_TheFollowingDimensionsWillBeUpgradedX'|translate(listOfDimensions) }}</p>
|
||||
{% endif %}
|
||||
|
||||
<h2>{{ 'CoreUpdater_NoteForLargePiwikInstances'|translate }}</h2>
|
||||
{% if isMajor %}
|
||||
<div class="alert alert-danger">
|
||||
{{ 'CoreUpdater_MajorUpdateWarning1'|translate }}
|
||||
{{ 'CoreUpdater_MajorUpdateWarning2'|translate }}
|
||||
</div>
|
||||
{% endif %}
|
||||
<p>{{ 'CoreUpdater_TheUpgradeProcessMayFailExecuteCommand'|translate('') }}</p>
|
||||
<pre>{{ commandUpgradePiwik }}</pre>
|
||||
<p>{{ 'CoreUpdater_HighTrafficPiwikServerEnableMaintenance'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=http%3A%2F%2Fpiwik.org%2Ffaq%2Fhow-to%2F%23faq_111">', '</a>')|raw }}</p>
|
||||
<p>{{ 'CoreUpdater_YouCouldManuallyExecuteSqlQueries'|translate }}</p>
|
||||
<p><a href="#" id="showSql">› {{ 'CoreUpdater_ClickHereToViewSqlQueries'|translate }}</a></p>
|
||||
<div id="sqlQueries" style="display:none;">
|
||||
<br/>
|
||||
<code>
|
||||
# {{ 'CoreUpdater_NoteItIsExpectedThatQueriesFail'|translate }}<br/><br/>
|
||||
{% for query in queries %}
|
||||
{{ query }}
|
||||
<br/>
|
||||
{% endfor %}
|
||||
</code>
|
||||
<pre># {{ 'CoreUpdater_NoteItIsExpectedThatQueriesFail'|translate }}<br/>{% for query in queries %}{{ query }}<br/>{% endfor %}</pre>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
<br/>
|
||||
<br/>
|
||||
<h4 id="titleUpdate">{{ 'CoreUpdater_ReadyToGo'|translate }}</h4>
|
||||
<p>{{ 'CoreUpdater_TheUpgradeProcessMayTakeAWhilePleaseBePatient'|translate }}</p>
|
||||
{% endif %}
|
||||
|
||||
{% if warningMessages|length > 0 %}
|
||||
<p><em>{{ warningMessages[0] }}</em>
|
||||
{% if warningMessages|length > 1 %}
|
||||
<button id="more-results" class="ui-button ui-state-default ui-corner-all">{{ 'General_Details'|translate }}</button>
|
||||
<h2>{{ 'CoreUpdater_ReadyToGo'|translate }}</h2>
|
||||
<p>{{ 'CoreUpdater_TheUpgradeProcessMayTakeAWhilePleaseBePatient'|translate }}</p>
|
||||
{% endif %}
|
||||
</p>
|
||||
{% endif %}
|
||||
|
||||
{% if coreToUpdate or pluginNamesToUpdate|length > 0 %}
|
||||
<br/>
|
||||
<form action="index.php" id="upgradeCorePluginsForm">
|
||||
<input type="hidden" name="updateCorePlugins" value="1"/>
|
||||
{% if queries|length == 1 %}
|
||||
<input type="submit" class="submit" value="{{ 'General_ContinueToPiwik'|translate }}"/>
|
||||
{% if warningMessages|length > 0 %}
|
||||
<div class="alert alert-info">
|
||||
{{ warningMessages[0] }}
|
||||
{% if warningMessages|length > 1 %}
|
||||
<button id="more-results" class="ui-button ui-state-default ui-corner-all">{{ 'General_Details'|translate }}</button>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% if coreToUpdate or pluginNamesToUpdate|length > 0 or dimensionsToUpdate|length > 0 %}
|
||||
<form action="index.php" id="upgradeCorePluginsForm" class="clearfix" data-updating="{{ 'CoreUpdater_Updating'|translate }}...">
|
||||
<input type="hidden" name="updateCorePlugins" value="1"/>
|
||||
{% if queries|length == 1 %}
|
||||
<input type="submit" class="submit" value="{{ 'General_ContinueToPiwik'|translate }}"/>
|
||||
{% else %}
|
||||
<input type="submit" class="submit" value="{{ 'CoreUpdater_UpgradePiwik'|translate }}"/>
|
||||
{% endif %}
|
||||
</form>
|
||||
{% else %}
|
||||
<input type="submit" class="submit" value="{{ 'CoreUpdater_UpgradePiwik'|translate }}"/>
|
||||
{% if warningMessages|length >= 0 %}
|
||||
<div class="alert alert-success">
|
||||
{{ 'CoreUpdater_PiwikHasBeenSuccessfullyUpgraded'|translate }}
|
||||
</div>
|
||||
{% endif %}
|
||||
<form action="index.php" class="clearfix">
|
||||
<input type="submit" class="submit" value="{{ 'General_ContinueToPiwik'|translate }}"/>
|
||||
</form>
|
||||
{% endif %}
|
||||
</form>
|
||||
{% else %}
|
||||
{% if warningMessages|length == 0 %}
|
||||
<p class="success">{{ 'CoreUpdater_PiwikHasBeenSuccessfullyUpgraded'|translate }}</p>
|
||||
{% endif %}
|
||||
<br/>
|
||||
<form action="index.php">
|
||||
<input type="submit" class="submit" value="{{ 'General_ContinueToPiwik'|translate }}"/>
|
||||
</form>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% include "@Installation/_integrityDetails.twig" %}
|
||||
{% include "@Installation/_integrityDetails.twig" %}
|
||||
|
||||
{% endspaceless %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -1,48 +0,0 @@
|
|||
{% autoescape false %}
|
||||
{% set helpMessage %}
|
||||
{{- 'CoreUpdater_HelpMessageContent'|translate('[',']','\n\n *') }}
|
||||
{% endset %}
|
||||
|
||||
*** {{ 'CoreUpdater_UpdateTitle'|translate }} ***
|
||||
{% if coreError %}
|
||||
|
||||
[X] {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }}
|
||||
|
||||
{% for message in errorMessages %}
|
||||
{{- message }}
|
||||
{% endfor %}
|
||||
|
||||
{{ 'CoreUpdater_HelpMessageIntroductionWhenError'|translate }}
|
||||
|
||||
* {{ helpMessage }}
|
||||
|
||||
{% elseif coreToUpdate or pluginNamesToUpdate|length > 0 %}
|
||||
|
||||
{{ 'CoreUpdater_DatabaseUpgradeRequired'|translate }}
|
||||
|
||||
{{ 'CoreUpdater_YourDatabaseIsOutOfDate'|translate }}
|
||||
|
||||
{% if coreToUpdate %}
|
||||
{{ 'CoreUpdater_PiwikWillBeUpgradedFromVersionXToVersionY'|translate(current_piwik_version, new_piwik_version) }}
|
||||
{% endif %}
|
||||
|
||||
{%- if pluginNamesToUpdate|length > 0 %}
|
||||
{%- set listOfPlugins %}{{ pluginNamesToUpdate|implode(', ') }}{% endset %}
|
||||
{{ 'CoreUpdater_TheFollowingPluginsWillBeUpgradedX'|translate( listOfPlugins) }}
|
||||
{% endif %}
|
||||
|
||||
{# dry run #}
|
||||
{% if queries is defined and queries is not empty %}
|
||||
*** Note: this is a Dry Run ***
|
||||
|
||||
{% for query in queries %}{{ query|trim }}
|
||||
{% endfor %}
|
||||
|
||||
*** End of Dry Run ***
|
||||
{% else %}
|
||||
{{ 'CoreUpdater_TheUpgradeProcessMayTakeAWhilePleaseBePatient'|translate }}
|
||||
{% endif %}
|
||||
|
||||
{% endif %}
|
||||
{% endautoescape %}
|
||||
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
{% extends '@CoreUpdater/layout.twig' %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<div class="header">
|
||||
<h1>{{ 'CoreUpdater_UpdateErrorTitle'|translate }}</h1>
|
||||
</div>
|
||||
|
||||
<div class="content">
|
||||
|
||||
{% for message in feedbackMessages %}
|
||||
<p>✓ {{ message }}</p>
|
||||
{% endfor %}
|
||||
|
||||
<div class="alert alert-danger">
|
||||
<strong>{{ 'CoreUpdater_UpdateErrorTitle'|translate }}:</strong>
|
||||
{{ error }}
|
||||
</div>
|
||||
|
||||
<p>
|
||||
{{ 'CoreUpdater_UpdateHasBeenCancelledExplanation'|translate("<br /><br />","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/update/'>","</a>")|raw }}
|
||||
</p>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="footer">
|
||||
<a href="index.php">{{ 'General_ContinueToPiwik'|translate }}</a>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
{% extends '@CoreUpdater/layout.twig' %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<div class="header">
|
||||
<h1>{{ 'CoreUpdater_UpdateErrorTitle'|translate }}</h1>
|
||||
</div>
|
||||
|
||||
<div class="content text-left">
|
||||
|
||||
<div class="alert alert-warning">
|
||||
{{ 'CoreUpdater_UpdateUsingHttpsFailed'|translate }}<br/>
|
||||
<em>{{ error }}</em>
|
||||
</div>
|
||||
|
||||
<p>{{ 'CoreUpdater_UpdateUsingHttpsFailedHelp'|translate }}</p>
|
||||
|
||||
<p>{{ 'CoreUpdater_UpdateUsingHttpsFailedHelpWhatToDo'|translate }}</p>
|
||||
|
||||
<form action="index.php">
|
||||
<input type="hidden" name="module" value="CoreUpdater"/>
|
||||
<input type="hidden" name="action" value="oneClickUpdate"/>
|
||||
<input type="hidden" name="https" value="1"/>
|
||||
<input id="updateUsingHttps" type="submit" value="{{ 'CoreUpdater_UpdateAutomatically'|translate }}"/>
|
||||
{{ 'CoreUpdater_UsingHttps'|translate }}
|
||||
</form>
|
||||
<br/>
|
||||
|
||||
<form action="index.php">
|
||||
<input type="hidden" name="module" value="CoreUpdater"/>
|
||||
<input type="hidden" name="action" value="oneClickUpdate"/>
|
||||
<input type="hidden" name="https" value="0"/>
|
||||
<input id="updateUsingHttp" type="submit" value="{{ 'CoreUpdater_UpdateAutomatically'|translate }}"/>
|
||||
{{ 'CoreUpdater_UsingHttp'|translate }}
|
||||
</form>
|
||||
<br/>
|
||||
|
||||
<form action="index.php">
|
||||
<input type="submit" value="{{ 'General_ContinueToPiwik'|translate }}"/>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="footer">
|
||||
<a href="index.php">{{ 'General_ContinueToPiwik'|translate }}</a>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
{% extends '@CoreUpdater/layout.twig' %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<div class="header">
|
||||
<h1>{{ 'CoreUpdater_UpdateSuccessTitle'|translate }}</h1>
|
||||
</div>
|
||||
|
||||
<div class="content">
|
||||
|
||||
<h2>
|
||||
{{ 'CoreUpdater_ThankYouUpdatePiwik'|translate }}
|
||||
</h2>
|
||||
|
||||
<p>
|
||||
{{ 'CoreUpdater_PostUpdateMessage'|translate }}
|
||||
|
||||
</p>
|
||||
<p></p>
|
||||
|
||||
<h2>
|
||||
{{ 'CoreUpdater_PostUpdateSupport'|translate }}
|
||||
</h2>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-5 col-sm-offset-1">
|
||||
<a href="https://piwik.pro/enterprise?pk_medium=App_Enterprise_button&pk_source=Piwik_App&pk_campaign=App_Updated" class="btn btn-lg btn-block">{{ 'CoreUpdater_EnterpriseSolutions'|translate }}</a>
|
||||
</div>
|
||||
<div class="col-sm-5">
|
||||
<a href="https://piwik.pro/cloud?pk_medium=App_Cloud_button&pk_source=Piwik_App&pk_campaign=App_Updated" class="btn btn-lg btn-block">{{ 'CoreUpdater_CloudHosting'|translate }}</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="footer">
|
||||
<a href="index.php">{{ 'General_ContinueToPiwik'|translate }}</a>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
Loading…
Add table
Add a link
Reference in a new issue