PDF rausgenommen
This commit is contained in:
aschwarz
@ -0,0 +1,18 @@
|
||||
<p>{{ 'ScheduledReports_EmailHello'|translate }}</p>
|
||||
|
||||
<p>{{ 'CoreUpdater_ThereIsNewVersionAvailableForUpdate'|translate }}</p>
|
||||
|
||||
<p>{{ 'CoreUpdater_YouCanUpgradeAutomaticallyOrDownloadPackage'|translate(latestVersion) }}<br/>
|
||||
{{ host }}index.php?module=CoreUpdater&action=newVersionAvailable
|
||||
</p>
|
||||
|
||||
{% if isStableVersion %}
|
||||
<p>
|
||||
{{ 'CoreUpdater_ViewVersionChangelog'|translate }}
|
||||
<br/>
|
||||
{{ linkToChangeLog }}
|
||||
</p>
|
||||
{% endif %}
|
||||
|
||||
<p>{{ 'CoreUpdater_ReceiveEmailBecauseIsSuperUser'|translate(host) }}</p>
|
||||
<p>{{ 'CoreUpdater_FeedbackRequest'|translate }}<br/>https://matomo.org/contact/</p>
|
||||
@ -0,0 +1,29 @@
|
||||
<!DOCTYPE html>
|
||||
<html id="ng-app" ng-app="piwikApp">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Matomo › {{ pageTitle|default('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">
|
||||
<meta name="google" content="notranslate">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="index.php?module=CoreUpdater&action=getUpdaterCss"/>
|
||||
<script type="text/javascript" src="index.php?module=CoreUpdater&action=getUpdaterJs"></script>
|
||||
|
||||
<script type="text/javascript">{{ getJavascriptTranslations()|raw }}</script>
|
||||
|
||||
{% include "@CoreHome/_favicon.twig" %}
|
||||
{% include "@CoreHome/_applePinnedTabIcon.twig" %}
|
||||
</head>
|
||||
<body id="simple" ng-app="app">
|
||||
|
||||
{% include "@CoreHome/_logo.twig" with { 'logoLink': false } %}
|
||||
|
||||
<div class="box">
|
||||
{% block content %}
|
||||
{% endblock %}
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@ -0,0 +1,50 @@
|
||||
{% extends '@CoreUpdater/layout.twig' %}
|
||||
{% import '@CorePluginsAdmin/macros.twig' as pluginsMacro %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<div class="header">
|
||||
<h1>{{ 'CoreUpdater_ThereIsNewVersionAvailableForUpdate'|translate }}</h1>
|
||||
</div>
|
||||
|
||||
<div class="content">
|
||||
|
||||
{% 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" value="{{ 'CoreUpdater_UpdateAutomatically'|translate }}"/>
|
||||
{% endif %}
|
||||
<a class="btn"
|
||||
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>{{ plugin.getMissingDependenciesAsString(piwik_new_version) }}</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
|
||||
<div class="footer">
|
||||
<a href="index.php">« {{ 'General_BackToPiwik'|translate }}</a>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
|
||||
@ -0,0 +1,85 @@
|
||||
{% extends '@CoreUpdater/layout.twig' %}
|
||||
{% set helpMessage %}
|
||||
{{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" rel="noreferrer noopener" href="https://matomo.org/faq/">','</a>','</li><li>')|raw }}
|
||||
{% endset %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
{% if coreError %}
|
||||
<div class="header">
|
||||
<h1>{{ 'CoreUpdater_UpdateErrorTitle'|translate }}</h1>
|
||||
</div>
|
||||
<div class="content">
|
||||
<div class="alert alert-danger">
|
||||
{{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }}
|
||||
{% for message in errorMessages %}
|
||||
<br/><strong>{{ message|striptags }}</strong>
|
||||
{% endfor %}
|
||||
</div>
|
||||
<p>{{ 'CoreUpdater_HelpMessageIntroductionWhenError'|translate }}</p>
|
||||
<ul>
|
||||
<li>{{ helpMessage }}</li>
|
||||
</ul>
|
||||
<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://matomo.org/faq/how-to-update/#faq_179' rel='noreferrer noopener' 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 %}
|
||||
|
||||
<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 %}
|
||||
@ -0,0 +1,107 @@
|
||||
{% extends '@CoreUpdater/layout.twig' %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<div class="header">
|
||||
<h1>{{ 'CoreUpdater_DatabaseUpgradeRequired'|translate }}</h1>
|
||||
<p>{{ 'CoreUpdater_YourDatabaseIsOutOfDate'|translate }}</p>
|
||||
{{ postEvent('Template.topBar')|raw }}
|
||||
</div>
|
||||
|
||||
<div class="content" style="text-align:left;">
|
||||
|
||||
{% set helpMessage %}
|
||||
{{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" rel="noreferrer noopener" href="https://matomo.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" rel="noreferrer noopener" href="https://matomo.org/faq/how-to/#faq_111">', '</a>')|raw }}</p>
|
||||
|
||||
{% if migrations is not empty %}
|
||||
<p>{{ 'CoreUpdater_ListOfSqlQueriesFYI'|translate(piwik_version) }}</p>
|
||||
<p><a href="#" id="showSql">› {{ 'CoreUpdater_ClickHereToViewSqlQueries'|translate }}</a></p>
|
||||
{% for group in migrations %}
|
||||
<div class="sqlQueries" style="display:none;">
|
||||
<pre># {% if group.type == 'sql' %}{{ 'CoreUpdater_TheseSqlQueriesWillBeExecuted'|translate }}{% else %}{{ 'CoreUpdater_TheseCommandsWillBeExecuted'|translate }}{% endif %} <br/>{% for migration in group.migrations %}{{ migration }}<br/>{% endfor %}</pre>
|
||||
</div>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
<h2>{{ 'CoreUpdater_NeedHelpUpgrading'|translate }}</h2>
|
||||
<p>{{ 'CoreUpdater_NeedHelpUpgradingText'|translate("<a rel='noreferrer noopener' target='_blank' href='https://matomo.org/support/upgrading-piwik/'>", "</a>")|raw }}</p>
|
||||
|
||||
<h2>{{ 'CoreUpdater_ReadyToGo'|translate }}</h2>
|
||||
<p>{{ 'CoreUpdater_TheUpgradeProcessMayTakeAWhilePleaseBePatient'|translate }}</p>
|
||||
{% endif %}
|
||||
|
||||
{% 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 queryCount == 1 %}
|
||||
<input type="submit" class="btn right" value="{{ 'General_ContinueToPiwik'|translate }}"/>
|
||||
{% else %}
|
||||
<input type="submit" class="btn right" value="{{ 'CoreUpdater_UpgradePiwik'|translate }}"/>
|
||||
{% endif %}
|
||||
</form>
|
||||
{% else %}
|
||||
{% if warningMessages|length >= 0 %}
|
||||
<div class="alert alert-success">
|
||||
{{ 'CoreUpdater_PiwikHasBeenSuccessfullyUpgraded'|translate }}
|
||||
</div>
|
||||
{% endif %}
|
||||
<form action="index.php" class="clearfix">
|
||||
<input type="submit" class="btn right" value="{{ 'General_ContinueToPiwik'|translate }}"/>
|
||||
</form>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% include "@Installation/_integrityDetails.twig" %}
|
||||
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
@ -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' rel='noreferrer noopener' href='https://matomo.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" style="text-align: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" class="btn" 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" class="btn" type="submit" value="{{ 'CoreUpdater_UpdateAutomatically'|translate }}"/>
|
||||
{{ 'CoreUpdater_UsingHttp'|translate }}
|
||||
</form>
|
||||
<br/>
|
||||
|
||||
<form action="index.php">
|
||||
<input type="submit" class="btn" value="{{ 'General_ContinueToPiwik'|translate }}"/>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="footer">
|
||||
<a href="index.php">{{ 'General_ContinueToPiwik'|translate }}</a>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
@ -0,0 +1,45 @@
|
||||
{% extends '@CoreUpdater/layout.twig' %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<div class="header">
|
||||
<h1>{{ 'CoreUpdater_UpdateSuccessTitle'|translate }}</h1>
|
||||
</div>
|
||||
|
||||
<div class="content">
|
||||
<h2>Piwik is now Matomo</h2>
|
||||
<p>
|
||||
<a target='_blank' rel='noreferrer noopener' href='https://matomo.org/blog/2018/01/piwik-is-now-matomo/'>
|
||||
<img src='https://matomo.org/wp-content/uploads/2018/01/banner_piwik_is_now_matomo.jpg' width='70%'>
|
||||
</a>
|
||||
</p>
|
||||
|
||||
<h2>
|
||||
{{ 'CoreUpdater_ThankYouUpdatePiwik'|translate }}
|
||||
</h2>
|
||||
|
||||
<p>
|
||||
{{ 'CoreUpdater_PostUpdateMessage'|translate }}
|
||||
|
||||
</p>
|
||||
|
||||
<h2>
|
||||
{{ 'CoreUpdater_PostUpdateSupport'|translate }}
|
||||
</h2>
|
||||
|
||||
<div class="row">
|
||||
<div class="col s5 offset-s1">
|
||||
<a href="https://matomo.org/support/?pk_medium=Update_Success_button&pk_source=Piwik_App&pk_campaign=App_Updated" class="btn btn-block">{{ 'CoreUpdater_ServicesSupport'|translate }}</a>
|
||||
</div>
|
||||
<div class="col s5">
|
||||
<a href="https://matomo.org/hosting/?pk_medium=App_Cloud_button&pk_source=Piwik_App&pk_campaign=App_Updated" class="btn btn-block">{{ 'CoreUpdater_CloudHosting'|translate }}</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="footer">
|
||||
<a href="index.php">{{ 'General_ContinueToPiwik'|translate }}</a>
|
||||
</div>
|
||||
|
||||
{% endblock %}
|
||||
Reference in New Issue
Block a user