coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

update Piwik to version 2.16 (fixes #91)

Browse source
This commit is contained in:
oliver 2016-04-10 18:55:57 +02:00
commit d885a4baa9
5833 changed files with 418860 additions and 226988 deletions
Download patch file Download diff file Expand all files Collapse all files

11
www/analytics/plugins/Installation/templates/_allSteps.twig
View file

@ -1,11 +0,0 @@
<ul>
{% for stepId,stepName in allStepsTitle %}
{% if currentStepId > stepId %}
<li class="pastStep">{{ stepName|translate }}</li>
{% elseif currentStepId == stepId %}
<li class="actualStep">{{ stepName|translate }}</li>
{% else %}
<li class="futureStep">{{ stepName|translate }}</li>
{% endif %}
{% endfor %}
</ul>

3
www/analytics/plugins/Installation/templates/_integrityDetails.twig
View file

@ -1,6 +1,3 @@
{% if warningMessages is not defined %}
{% set warningMessages=infos.integrityErrorMessages %}
{% endif %}
<div id="integrity-results" title="{{ 'Installation_SystemCheckFileIntegrity'|translate }}" style="display:none; font-size: 62.5%;">
<table>
{% for msg in warningMessages %}

27
www/analytics/plugins/Installation/templates/_systemCheckLegend.twig
View file

@ -1,15 +1,20 @@
<div id="systemCheckLegend">
<span style="font-size: small;">
<h2>{{ 'Installation_Legend'|translate }}</h2>
<br/>
<img src='plugins/Zeitgeist/images/warning.png'/> <span class="warn">{{ 'General_Warning'|translate }}: {{ 'Installation_SystemCheckWarning'|translate }}</span>
<br/>
<img src='plugins/Zeitgeist/images/error.png'/> <span style="color:red;font-weight:bold;">{{ 'General_Error'|translate }}
: {{ 'Installation_SystemCheckError'|translate }} </span><br/>
<img src='plugins/Zeitgeist/images/ok.png'/> <span style="color:#26981C;font-weight:bold;">{{ 'General_Ok'|translate }}</span><br/>
</span>
<div class="system-check-legend">
<h2>{{ 'Installation_Legend'|translate }}</h2>
<p>
<span class="icon-ok"></span>
{{ 'General_Ok'|translate }}
</p>
<p>
<span class="icon-warning"></span>
{{ 'General_Warning'|translate }}: {{ 'Installation_SystemCheckWarning'|translate }}
</p>
<p>
<span class="icon-error"></span>
{{ 'General_Error'|translate }}: {{ 'Installation_SystemCheckError'|translate }}
</p>
</div>
<p class="nextStep">
<p class="next-step">
<a href="{{ url }}">{{ 'General_RefreshPage'|translate }} &raquo;</a>
</p>

359
www/analytics/plugins/Installation/templates/_systemCheckSection.twig
View file

@ -1,329 +1,50 @@
{% set ok %}<img src='plugins/Zeitgeist/images/ok.png' />{% endset %}
{% set error %}<img src='plugins/Zeitgeist/images/error.png' />{% endset %}
{% set warning %}<img src='plugins/Zeitgeist/images/warning.png' />{% endset %}
{% set link %}<img src='plugins/Zeitgeist/images/link.gif' />{% endset %}
{% import _self as local %}
<table class="infosServer" id="systemCheckRequired">
<tr>
{% set MinPHP %}{{ 'Installation_SystemCheckPhp'|translate }} &gt; {{ infos.phpVersion_minimum }}{% endset %}
<td class="label">{{ MinPHP }}</td>
<table class="simple-table system-check" id="systemCheckRequired">
{{ local.diagnosticTable(diagnosticReport.getMandatoryDiagnosticResults()) }}
</table>
<td>
{% if infos.phpVersion_ok %}
{{ ok }}
{% else %}
{{ error }} <span class="err">{{ 'General_Error'|translate }}: {{ 'General_Required'|translate(MinPHP)|raw }}</span>
{% endif %}
</td>
</tr>
<tr>
<td class="label">PDO {{ 'Installation_Extension'|translate }}</td>
<td>
{% if infos.pdo_ok %}
{{- ok -}}
{% else %}
-
{% endif %}
</td>
</tr>
{% for adapter, port in infos.adapters %}
<h3>{{ 'Installation_Optional'|translate }}</h3>
<table class="simple-table system-check" id="systemCheckOptional">
{{ local.diagnosticTable(diagnosticReport.getOptionalDiagnosticResults()) }}
</table>
{% macro diagnosticTable(results) %}
{% set error = constant('Piwik\\Plugins\\Diagnostics\\Diagnostic\\DiagnosticResult::STATUS_ERROR') %}
{% set warning = constant('Piwik\\Plugins\\Diagnostics\\Diagnostic\\DiagnosticResult::STATUS_WARNING') %}
{% set errorIcon %} <span class="icon-error"></span> {% endset %}
{% set warningIcon %} <span class="icon-warning"></span> {% endset %}
{% set okIcon %} <span class="icon-ok"></span> {% endset %}
{% for result in results %}
<tr>
<td class="label">{{ adapter }} {{ 'Installation_Extension'|translate }}</td>
<td>{{ ok }}</td>
</tr>
{% endfor %}
{% if infos.adapters|length == 0 %}
<tr>
<td colspan="2" class="error" style="font-size: small;">
{{ 'Installation_SystemCheckDatabaseHelp'|translate }}
<p>
{% if infos.isWindows %}
{{ 'Installation_SystemCheckWinPdoAndMysqliHelp'|translate("<br /><br /><code>extension=php_mysqli.dll</code><br /><code>extension=php_pdo.dll</code><br /><code>extension=php_pdo_mysql.dll</code><br />")|raw|nl2br }}
<td>{{ result.label }}</td>
<td>
{% for item in result.items %}
{% if item.status == error %}
{{ errorIcon }} <span class="err">{{ item.comment|raw }}</span>
{% elseif item.status == warning %}
{{ warningIcon }} {{ item.comment|raw }}
{% else %}
{{ 'Installation_SystemCheckPdoAndMysqliHelp'|translate("<br /><br /><code>--with-mysqli</code><br /><code>--with-pdo-mysql</code><br /><br />","<br /><br /><code>extension=mysqli.so</code><br /><code>extension=pdo.so</code><br /><code>extension=pdo_mysql.so</code><br />")|raw }}
{{ okIcon }} {{ item.comment|raw }}
{% endif %}
{{ 'Installation_RestartWebServer'|translate }}
<br/>
<br/>
{{ 'Installation_SystemCheckPhpPdoAndMysqli'|translate("<a style=\"color:red\" href=\"http:\/\/php.net\/pdo\">","<\/a>","<a style=\"color:red\" href=\"http:\/\/php.net\/mysqli\">","<\/a>")|raw|nl2br }}
</p>
</td>
</tr>
{% endif %}
<tr>
<td class="label">{{ 'Installation_SystemCheckExtensions'|translate }}</td>
<td>
{% for needed_extension in infos.needed_extensions %}
{% if needed_extension in infos.missing_extensions %}
{{ error }}
{% set hasError %}1{% endset %}
{% else %}
{{ ok }}
{% endif %}
{{ needed_extension }}
<br/>
{% endfor %}
<br/>{% if hasError is defined %}{{ 'Installation_RestartWebServer'|translate }}{% endif %}
</td>
</tr>
{% if infos.missing_extensions|length > 0 %}
<tr>
<td colspan="2" class="error" style="font-size: small;">
{% for missing_extension in infos.missing_extensions %}
<p>
<em>{{ helpMessages[missing_extension]|translate }}</em>
</p>
{% endfor %}
</td>
</tr>
{% endif %}
<tr>
<td class="label">{{ 'Installation_SystemCheckFunctions'|translate }}</td>
<td>
{% for needed_function in infos.needed_functions %}
{% if needed_function in infos.missing_functions %}
{{ error }}
<span class='err'>{{ needed_function }}</span>
{% set hasError %}1{% endset %}
<p>
<em>{{ helpMessages[needed_function]|translate }}</em>
</p>
{% else %}
{{ ok }} {{ needed_function }}
<br/>
{% endif %}
{% endfor %}
<br/>{% if hasError is defined %}{{ 'Installation_RestartWebServer'|translate }}{% endif %}
</td>
</tr>
<tr>
<td valign="top">
{{ 'Installation_SystemCheckWriteDirs'|translate }}
</td>
<td style="font-size: small;">
{% for dir, bool in infos.directories %}
{% if bool %}
{{ ok }}
{% else %}
<span style="color:red;">{{ error }}</span>
{% endif %}
{{ dir }}
<br/>
{% endfor %}
</td>
</tr>
{% if problemWithSomeDirectories %}
<tr>
<td colspan="2" class="error">
{{ 'Installation_SystemCheckWriteDirsHelp'|translate }}:
{% for dir,bool in infos.directories %}
<ul>
{% if not bool %}
<li>
<pre>chmod a+w {{ dir }}</pre>
</li>
{% endif %}
</ul>
{% endfor %}
</td>
</tr>
{% endif %}
</table>
<br/>
{% if result.longErrorMessage %}
<tr>
<td colspan="2" class="error" style="font-size: small;">
{{ result.longErrorMessage|raw }}
</td>
</tr>
{% endif %}
{% endfor %}
<h2>{{ 'Installation_Optional'|translate }}</h2>
<table class="infos" id="systemCheckOptional">
<tr>
<td class="label">{{ 'Installation_SystemCheckFileIntegrity'|translate }}</td>
<td>
{% if infos.integrityErrorMessages is empty %}
{{ ok }}
{% else %}
{% if infos.integrity %}
{{ warning }}
<em>{{ infos.integrityErrorMessages[0] }}</em>
{% else %}
{{ error }}
<em>{{ infos.integrityErrorMessages[0] }}</em>
{% endif %}
{% if infos.integrityErrorMessages|length > 1 %}
<button id="more-results" class="ui-button ui-state-default ui-corner-all">{{ 'General_Details'|translate }}</button>
{% endif %}
{% endif %}
</td>
</tr>
<tr>
<td class="label">{{ 'Installation_SystemCheckTracker'|translate }}</td>
<td>
{% if infos.tracker_status == 0 %}
{{ ok }}
{% else %}
{{ warning }}
<span class="warn">{{ infos.tracker_status }}
<br/>{{ 'Installation_SystemCheckTrackerHelp'|translate }} </span>
<br/>
{{ 'Installation_RestartWebServer'|translate }}
{% endif %}
</td>
</tr>
<tr>
<td class="label">{{ 'Installation_SystemCheckMemoryLimit'|translate }}</td>
<td>
{% if infos.memory_ok %}
{{ ok }} {{ infos.memoryCurrent }}
{% else %}
{{ warning }}
<span class="warn">{{ infos.memoryCurrent }}</span>
<br/>
{{ 'Installation_SystemCheckMemoryLimitHelp'|translate }}
{{ 'Installation_RestartWebServer'|translate }}
{% endif %}
</td>
</tr>
<tr>
<td class="label">{{ 'SitesManager_Timezone'|translate }}</td>
<td>
{% if infos.timezone %}
{{ ok }}
{% else %}
{{ warning }}
<span class="warn">{{ 'SitesManager_AdvancedTimezoneSupportNotFound'|translate }} </span>
<br/>
<a href="http://php.net/manual/en/datetime.installation.php" target="_blank">Timezone PHP documentation</a>
.
{% endif %}
</td>
</tr>
<tr>
<td class="label">{{ 'Installation_SystemCheckOpenURL'|translate }}</td>
<td>
{% if infos.openurl %}
{{ ok }} {{ infos.openurl }}
{% else %}
{{ warning }}
<span class="warn">{{ 'Installation_SystemCheckOpenURLHelp'|translate }}</span>
{% endif %}
{% if not infos.can_auto_update %}
<br/>
{{ warning }} <span class="warn">{{ 'Installation_SystemCheckAutoUpdateHelp'|translate }}</span>
{% endif %}
</td>
</tr>
<tr>
<td class="label">{{ 'Installation_SystemCheckGDFreeType'|translate }}</td>
<td>
{% if infos.gd_ok %}
{{ ok }}
{% else %}
{{ warning }} <span class="warn">{{ 'Installation_SystemCheckGDFreeType'|translate }}
<br/>
{{ 'Installation_SystemCheckGDHelp'|translate }} </span>
{% endif %}
</td>
</tr>
<tr>
<td class="label">{{ 'Installation_SystemCheckOtherExtensions'|translate }}</td>
<td>
{% for desired_extension in infos.desired_extensions %}
{% if desired_extension in infos.missing_desired_extensions %}
{{ warning }}<span class="warn">{{ desired_extension }}</span>
<p>{{ helpMessages[desired_extension]|translate }}</p>
{% else %}
{{ ok }} {{ desired_extension }}
<br/>
{% endif %}
{% endfor %}
</td>
</tr>
<tr>
<td class="label">{{ 'Installation_SystemCheckOtherFunctions'|translate }}</td>
<td>
{% for desired_function in infos.desired_functions %}
{% if desired_function in infos.missing_desired_functions %}
{{ warning }}
<span class="warn">{{ desired_function }}</span>
<p>{{ helpMessages[desired_function]|translate }}</p>
{% else %}
{{ ok }} {{ desired_function }}
<br/>
{% endif %}
{% endfor %}
</td>
</tr>
<tr>
<td class="label">{{ 'Installation_Filesystem'|translate }}</td>
<td>
{% if not infos.is_nfs %}
{{ ok }} {{ 'General_Ok'|translate }}
<br/>
{% else %}
{{ warning }}
<span class="warn">{{ 'Installation_NfsFilesystemWarning'|translate }}</span>
{% if duringInstall is not empty %}
<p>{{ 'Installation_NfsFilesystemWarningSuffixInstall'|translate }}</p>
{% else %}
<p>{{ 'Installation_NfsFilesystemWarningSuffixAdmin'|translate }}</p>
{% endif %}
{% endif %}
</td>
</tr>
{% if duringInstall is empty %}
<tr>
<td class="label">{{ 'UserCountry_Geolocation'|translate }}</td>
<td>
{% if infos.extra.geolocation_ok %}
{{ ok }} {{ 'General_Ok'|translate }}
<br/>
{% elseif infos.extra.geolocation_using_non_recommended %}
{{ warning }}
<span class="warn">{{ 'UserCountry_GeoIpLocationProviderNotRecomnended'|translate }}
{{ 'UserCountry_GeoIpLocationProviderDesc_ServerBased2'|translate('<a href="http://piwik.org/docs/geo-locate/" target="_blank">', '', '', '</a>')|raw }}</span>
<br/>
{% else %}
{{ warning }}
<span class="warn">{{ 'UserCountry_DefaultLocationProviderDesc1'|translate }}
{{ 'UserCountry_DefaultLocationProviderDesc2'|translate('<a href="http://piwik.org/docs/geo-locate/" target="_blank">', '', '', '</a>')|raw }} </span>
</span>
{% endif %}
</td>
</tr>
{% endif %}
{% if infos.general_infos.assume_secure_protocol is defined %}
<tr>
<td class="label">{{ 'Installation_SystemCheckSecureProtocol'|translate }}</td>
<td>
{{ warning }} <span class="warn">{{ infos.protocol }} </span><br/>
{{ 'Installation_SystemCheckSecureProtocolHelp'|translate }}
<br/><br/>
<code>[General]<br/>
assume_secure_protocol = 1</code><br/>
</td>
</tr>
{% endif %}
{% if infos.extra.load_data_infile_available is defined %}
<tr>
<td class="label">{{ 'Installation_DatabaseAbilities'|translate }}</td>
<td>
{% if infos.extra.load_data_infile_available %}
{{ ok }} LOAD DATA INFILE
<br/>
{% else %}
{{ warning }}
<span class="warn">LOAD DATA INFILE</span>
<br/>
<br/>
<p>{{ 'Installation_LoadDataInfileUnavailableHelp'|translate("LOAD DATA INFILE","FILE") }}</p>
<p>{{ 'Installation_LoadDataInfileRecommended'|translate }}</p>
{% if infos.extra.load_data_infile_error is defined %}
<em><strong>{{ 'General_Error'|translate }}:</strong></em>
{{ infos.extra.load_data_infile_error|raw }}
{% endif %}
<p>Troubleshooting: <a target='_blank' href="?module=Proxy&action=redirect&url=http://piwik.org/faq/troubleshooting/%23faq_194">FAQ on piwik.org</a></p>
{% endif %}
</td>
</tr>
{% endif %}
</table>
{% include "@Installation/_integrityDetails.twig" %}
{% endmacro %}

5
www/analytics/plugins/Installation/templates/cannotConnectToDb.twig Normal file
View file

@ -0,0 +1,5 @@
<p>{{ 'Installation_CannotConnectToDb'|translate }}:</p>
<p><strong>{{ exceptionMessage }}</strong></p>
<p>{{ 'Installation_CannotConnectToDbResolvingExplanation'|translate('<a href="javascript:window.location.reload()">', '</a>')|raw }}</p>

36
www/analytics/plugins/Installation/templates/databaseCheck.twig
View file

@ -1,36 +0,0 @@
{% extends '@Installation/layout.twig' %}
{% block content %}
{% set ok %}<img src='plugins/Zeitgeist/images/ok.png' />{% endset %}
{% set error %}<img src='plugins/Zeitgeist/images/error.png' />{% endset %}
{% set warning %}<img src='plugins/Zeitgeist/images/warning.png' />{% endset %}
{% set link %}<img src='plugins/Zeitgeist/images/link.gif' />{% endset %}
<h2>{{ 'Installation_DatabaseCheck'|translate }}</h2>
<table class="infosServer">
<tr>
<td class="label">{{ 'Installation_DatabaseServerVersion'|translate }}</td>
<td>{% if databaseVersionOk is defined %}{{ ok }}{% else %}{{ error }}{% endif %}</td>
</tr>
<tr>
<td class="label">{{ 'Installation_DatabaseClientVersion'|translate }}</td>
<td>{% if clientVersionWarning is defined %}{{ warning }}{% else %}{{ ok }}{% endif %}</td>
</tr>
{% if clientVersionWarning is defined %}
<tr>
<td colspan="2">
<span style="font-size: small;color:#FF7F00;">{{ clientVersionWarning }}</span>
</td>
</tr>
{% endif %}
<tr>
<td class="label">{{ 'Installation_DatabaseCreation'|translate }}</td>
<td>{% if databaseCreated is defined %}{{ ok }}{% else %}{{ error }}{% endif %}</td>
</tr>
</table>
<p>
{{ link }} <a href="?module=Proxy&action=redirect&url=http://piwik.org/docs/requirements/" target="_blank">{{ 'Installation_Requirements'|translate }}</a>
</p>
{% endblock %}

24
www/analytics/plugins/Installation/templates/databaseSetup.twig
View file

@ -1,18 +1,18 @@
{% extends '@Installation/layout.twig' %}
{% block content %}
<h2>{{ 'Installation_DatabaseSetup'|translate }}</h2>
{% if errorMessage is defined %}
<div class="error">
<img src="plugins/Zeitgeist/images/error_medium.png"/>
{{ 'Installation_DatabaseErrorConnect'|translate }}:
<br/>{{ errorMessage|raw }}
<h2>{{ 'Installation_DatabaseSetup'|translate }}</h2>
</div>
{% endif %}
{% if errorMessage is defined %}
<div class="alert alert-danger">
{{ 'Installation_DatabaseErrorConnect'|translate }}:
{{ errorMessage|raw }}
</div>
{% endif %}
{% if form_data is defined %}
{% include "genericForm.twig" %}
{% endif %}
{% endblock %}
{% if form_data is defined %}
{% include "genericForm.twig" %}
{% endif %}
{% endblock %}

50
www/analytics/plugins/Installation/templates/finished.twig
View file

@ -1,24 +1,46 @@
{% extends '@Installation/layout.twig' %}
{% block content %}
<h2>{{ 'Installation_Congratulations'|translate|raw }}</h2>
{{ 'Installation_CongratulationsHelp'|translate|raw }}
<h2>{{ 'Installation_Congratulations'|translate|raw }}</h2>
{{ 'Installation_CongratulationsHelp'|translate|raw }}
<br/>
<h2>{{ 'Installation_WelcomeToCommunity'|translate }}</h2>
<p>
{{ 'Installation_CollaborativeProject'|translate }}
</p><p>
{{ 'Installation_GetInvolved'|translate('<a target="_blank" href="http://piwik.org/get-involved/">','</a>')|raw }}
{{ 'General_HelpTranslatePiwik'|translate("<a target='_blank' href=\'http://piwik.org/translations/\'>","<\/a>")|raw }}
</p>
<h3>{{ 'Installation_WelcomeToCommunity'|translate }}</h3>
<p>
{{ 'Installation_CollaborativeProject'|translate }}
</p>
<p>
{{ 'Installation_GetInvolved'|translate('<a rel="noreferrer" target="_blank" href="http://piwik.org/get-involved/">','</a>')|raw }}
{{ 'General_HelpTranslatePiwik'|translate("<a rel='noreferrer' target='_blank' href=\'http://piwik.org/translations/\'>","<\/a>")|raw }}
</p>
<p>{{ 'Installation_WeHopeYouWillEnjoyPiwik'|translate }}</p>
<p><i>{{ 'Installation_HappyAnalysing'|translate }}</i></p>
<p class="nextStep">
<a class="submit" href="index.php">{{ 'General_ContinueToPiwik'|translate }} &raquo;</a>
</p>
{% if arePiwikProAdsEnabled %}
<h3>{{ 'Installation_PiwikProAdTitle'|translate }}</h3>
<p>
{% set linkOnPremises = 'Installation_End'|piwikProOnPremisesPromoUrl %}
{% set linkOnCloud = 'Installation_End'|piwikProCloudPromoUrl %}
{{ 'Installation_PiwikProAdText'|translate('<a rel="noreferrer" target="_blank" href="' ~ linkOnPremises ~ '">','</a>', '<a rel="noreferrer" target="_blank" href="' ~ linkOnCloud ~ '">','</a>')|raw }}
</p>
{% endif %}
<h3>{{ 'Installation_DefaultSettings'|translate }}</h3>
<p>{{ 'Installation_DefaultSettingsHelp'|translate }}</p>
{% if errorMessage is defined %}
<div class="alert alert-danger">
{{ 'General_Error'|translate }}:
<br/>- {{ errorMessage|raw }}
</div>
{% endif %}
<div class="installation-finished">
{% if form_data is defined %}
{% include "genericForm.twig" %}
{% endif %}
</div>
{% endblock %}

44
www/analytics/plugins/Installation/templates/firstWebsiteSetup.twig
View file

@ -1,27 +1,29 @@
{% extends '@Installation/layout.twig' %}
{% block content %}
{% if displayGeneralSetupSuccess is defined %}
<span id="toFade" class="success">
{{ 'Installation_SuperUserSetupSuccess'|translate }}
<img src="plugins/Zeitgeist/images/success_medium.png"/>
</span>
{% endif %}
<h2>{{ 'Installation_SetupWebsite'|translate }}</h2>
<p>{{ 'Installation_SiteSetup'|translate }}</p>
{% if errorMessage is defined %}
<div class="error">
<img src="plugins/Zeitgeist/images/error_medium.png"/>
{{ 'Installation_SetupWebsiteError'|translate }}:
<br/>- {{ errorMessage|raw }}
<h2>{{ 'Installation_SetupWebsite'|translate }}</h2>
</div>
{% endif %}
{% if displayGeneralSetupSuccess is defined %}
<div id="feedback" class="alert alert-success">
{{ 'Installation_SuperUserSetupSuccess'|translate }}
</div>
{% endif %}
{% if form_data is defined %}
{% include "genericForm.twig" %}
{% endif %}
<br/>
<p><em>{{ 'Installation_SiteSetupFootnote'|translate }}</em></p>
{% endblock %}
<p>{{ 'Installation_SiteSetup'|translate }}</p>
{% if errorMessage is defined %}
<div class="alert alert-danger">
{{ 'Installation_SetupWebsiteError'|translate }}:
<br/>- {{ errorMessage|raw }}
</div>
{% endif %}
{% if form_data is defined %}
{% include "genericForm.twig" %}
{% endif %}
<div class="clearfix"></div>
<p><em>{{ 'Installation_SiteSetupFootnote'|translate }}</em></p>
{% endblock %}

18
www/analytics/plugins/Installation/templates/generalSetup.twig
View file

@ -1,18 +0,0 @@
{% extends '@Installation/layout.twig' %}
{% block content %}
<h2>{{ 'Installation_SuperUser'|translate }}</h2>
{% if errorMessage is defined %}
<div class="error">
<img src="plugins/Zeitgeist/images/error_medium.png"/>
{{ 'Installation_SuperUserSetupError'|translate }}:
<br/>- {{ errorMessage|raw }}
</div>
{% endif %}
{% if form_data is defined %}
{% include "genericForm.twig" %}
{% endif %}
{% endblock %}

106
www/analytics/plugins/Installation/templates/layout.twig
View file

@ -1,62 +1,96 @@
<!DOCTYPE html>
<html>
<html id="ng-app" ng-app="piwikApp">
<head>
<meta charset="utf-8">
<meta name="robots" content="noindex,nofollow">
<title>Piwik &rsaquo; {{ 'Installation_Installation'|translate }}</title>
<link rel="stylesheet" type="text/css" href="libs/jquery/themes/base/jquery-ui.css"/>
<link rel="stylesheet" type="text/css" href="index.php?module=Installation&action=getBaseCss"/>
<link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
<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="plugins/Installation/javascripts/installation.js"></script>
<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/Installation/stylesheets/installation.css"/>
{% 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.png"/>
<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="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>
</head>
<body>
<div id="installationPage">
<div id="content">
<div id="logo">
<img id="title" src="plugins/Morpheus/images/logo.png"/> &nbsp;&nbsp;&nbsp;<span
id="subtitle"># {{ 'General_OpenSourceWebAnalytics'|translate }}</span>
<!--[if lt IE 9 ]>
<body ng-app="app" class="old-ie"> <![endif]-->
<!--[if (gte IE 9)|!(IE)]><!-->
<body ng-app="app"><!--<![endif]-->
<div class="container">
<div class="header">
<div class="logo">
<img src="plugins/Morpheus/images/logo.png"/>
<p>{{ 'General_OpenSourceWebAnalytics'|translate }}</p>
</div>
<div style="float:right;" id="topRightBar">
<br/>
<div class="language-selector">
{{ postEvent('Template.topBar')|raw }}
</div>
<div class="both"></div>
<div id="generalInstall">
{% include "@Installation/_allSteps.twig" %}
<div class="installation-progress">
<h4>
{{ 'Installation_InstallationStatus'|translate }}
<small>{{ percentDone }}%</small>
</h4>
<div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="60" aria-valuemin="0" aria-valuemax="100" style="width: {{ percentDone }}%;"></div>
</div>
</div>
<div id="detailInstall">
<div class="clearfix"></div>
</div>
<div class="row">
<div class="col-sm-3">
<ul class="list-group">
{% for stepId,stepName in allStepsTitle %}
{% if currentStepId > stepId %}
{% set stepClass = 'disabled' %}
{% elseif currentStepId == stepId %}
{% set stepClass = 'active' %}
{% else %}
{% set stepClass = '' %}
{% endif %}
<li class="list-group-item {{ stepClass }}">{{ stepId + 1 }}. {{ stepName|translate }}</li>
{% endfor %}
</ul>
</div>
<div class="col-sm-9 content">
{% set nextButton %}
<p class="nextStep">
<a class="submit" href="{{ linkTo({'action':nextModuleName, 'token_auth':null, 'method':null }) }}">{{ 'General_Next'|translate }} &raquo;</a>
</p>
{% endset %}
<p class="next-step">
<a class="btn btn-lg" href="{{ linkTo({'action':nextModuleName, 'token_auth':null, 'method':null }) }}">
{{ 'General_Next'|translate }} &raquo;</a>
</p>
{% endset %}
{% if showNextStepAtTop is defined and showNextStepAtTop %}
{{ nextButton }}
{% endif %}
{% block content %}{% endblock %}
{% if showNextStep %}
{{ nextButton }}
{% endif %}
</div>
<div class="both"></div>
<br/>
<br/>
<h3>{{ 'Installation_InstallationStatus'|translate }}</h3>
<div id="progressbar" data-progress="{{ percentDone }}"></div>
{{ 'Installation_PercentDone'|translate(percentDone) }}
</div>
</div>
</body>
</html>

126
www/analytics/plugins/Installation/templates/reuseTables.twig
View file

@ -2,80 +2,76 @@
{% block content %}
{% set helpMessage %}{{- 'CoreUpdater_HelpMessageContent'|translate('[',']',"<br/>")|raw }}{% endset %}
{% set helpMessage %}{{- 'CoreUpdater_HelpMessageContent'|translate('[',']',"<br/>")|raw }}{% endset %}
<h2>{{ 'Installation_ReusingTables'|translate }}</h2>
<h2>{{ 'Installation_ReusingTables'|translate }}</h2>
<div class="reuseTables">
<div class="reuseTables">
{% if coreError %}
<div class="error">
<img src="plugins/Zeitgeist/images/error_medium.png"/> {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }}
<ul>
{% for message in errorMessages %}
<li>{{ message }}</li>
{% endfor %}
</ul>
</div>
<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">
<img src="plugins/Zeitgeist/images/warning_medium.png"/> {{ 'CoreUpdater_WarningMessages'|translate }}
{% if coreError %}
<div class="alert alert-danger">
{{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }}
<ul>
{% for message in errorMessages %}
<li>{{ message }}</li>
{% endfor %}
</ul>
</div>
<p>{{ 'CoreUpdater_HelpMessageIntroductionWhenError'|translate }}</p>
<ul>
{% for message in warningMessages %}
<li>{{ message }}</li>
{% endfor %}
<li>{{ helpMessage }}</li>
</ul>
</div>
{% endif %}
{% if errorMessages|length > 0 %}
<div class="error">
<img src="plugins/Zeitgeist/images/error_medium.png"/> {{ 'CoreUpdater_ErrorDuringPluginsUpdates'|translate }}
<p>{{ 'CoreUpdater_ErrorDIYHelp'|translate }}</p>
<ul>
{% for message in errorMessages %}
<li>{{ message }}</li>
{% endfor %}
<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>
{% 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>
{% else %}
{% if warningMessages|length > 0 %}
<div class="alert alert-warning">
{{ 'CoreUpdater_WarningMessages'|translate }}
<ul>
{% for message in warningMessages %}
<li>{{ message }}</li>
{% endfor %}
</ul>
</div>
{% endif %}
</div>
{% endif %}
{% if errorMessages|length > 0 or warningMessages|length > 0 %}
<p>{{ 'CoreUpdater_HelpMessageIntroductionWhenWarning'|translate }}
<ul>
<li>{{ helpMessage }}</li>
</ul>
</p>
{% else %}
<div class="success"> {{ 'Installation_TablesUpdatedSuccess'|translate(oldVersion, currentVersion) }}
<img src="plugins/Zeitgeist/images/success_medium.png"/></div>
<br />
{% if errorMessages|length > 0 %}
<div class="alert alert-error">
{{ 'CoreUpdater_ErrorDuringPluginsUpdates'|translate }}
<ul>
{% for message in errorMessages %}
<li>{{ message }}</li>
{% endfor %}
</ul>
{% endif %}
{% if deactivatedPlugins is defined and deactivatedPlugins|length > 0 %}
{% set listOfDeactivatedPlugins=deactivatedPlugins|join(', ') %}
<p>
{{ 'CoreUpdater_WeAutomaticallyDeactivatedTheFollowingPlugins'|translate(listOfDeactivatedPlugins) }}
</p>
{% endif %}
</div>
{% endif %}
{% endif %}
{% if errorMessages|length > 0 or warningMessages|length > 0 %}
<p>{{ 'CoreUpdater_HelpMessageIntroductionWhenWarning'|translate }}</p>
<ul>
<li>{{ helpMessage }}</li>
</ul>
{% else %}
<div class="alert alert-success">
{{ 'Installation_TablesUpdatedSuccess'|translate(oldVersion, currentVersion) }}
</div>
{% endif %}
</div>
{% endblock %}
{% endif %}
</div>
{% endblock %}

18
www/analytics/plugins/Installation/templates/setupSuperUser.twig Normal file
View file

@ -0,0 +1,18 @@
{% extends '@Installation/layout.twig' %}
{% block content %}
<h2>{{ 'Installation_SuperUser'|translate }}</h2>
{% if errorMessage is defined %}
<div class="alert alert-danger">
{{ 'Installation_SuperUserSetupError'|translate }}:
<br/>- {{ errorMessage|raw }}
</div>
{% endif %}
{% if form_data is defined %}
{% include "genericForm.twig" %}
{% endif %}
{% endblock %}

42
www/analytics/plugins/Installation/templates/systemCheck.twig
View file

@ -1,21 +1,31 @@
{% extends '@Installation/layout.twig' %}
{% block content %}
{% if not showNextStep %}
{% include "@Installation/_systemCheckLegend.twig" %}
<br style="clear:both;">
{% endif %}
<h3>{{ 'Installation_SystemCheck'|translate }}</h3>
<br/>
{% include "@Installation/_systemCheckSection.twig" %}
<script type="text/javascript">
$(function () {
// client-side test for https to handle the case where the server is behind a reverse proxy
if (document.location.protocol === 'https:') {
$('p.next-step a').attr('href', $('p.next-step a').attr('href') + '&clientProtocol=https');
}
});
</script>
{% if not showNextStep %}
<br/>
<p>
<img src='plugins/Zeitgeist/images/link.gif'/> &nbsp;
<a href="?module=Proxy&action=redirect&url=http://piwik.org/docs/requirements/" target="_blank">{{ 'Installation_Requirements'|translate }}</a>
</p>
{% include "@Installation/_systemCheckLegend.twig" %}
{% endif %}
{% endblock %}
{% if not showNextStep %}
{% include "@Installation/_systemCheckLegend.twig" %}
<br style="clear:both;">
{% endif %}
<h2>{{ 'Installation_SystemCheck'|translate }}</h2>
{% include "@Installation/_systemCheckSection.twig" %}
{% if not showNextStep %}
<p>
<span class="icon-export"></span>
<a href="?module=Proxy&action=redirect&url=http://piwik.org/docs/requirements/" target="_blank">{{ 'Installation_Requirements'|translate }}</a>
</p>
{% include "@Installation/_systemCheckLegend.twig" %}
{% endif %}
{% endblock %}

35
www/analytics/plugins/Installation/templates/systemCheckPage.twig
View file

@ -1,20 +1,27 @@
{% extends 'admin.twig' %}
{% set title %}{{ 'Installation_SystemCheck'|translate }}{% endset %}
{% block content %}
{% if isSuperUser %}
<h2 piwik-enriched-headline>{{ 'Installation_SystemCheck'|translate }}</h2>
<p style="margin-left:1em;">
{% if infos.has_errors %}
<img src="plugins/Zeitgeist/images/error.png"/>
{{ 'Installation_SystemCheckSummaryThereWereErrors'|translate('<strong>','</strong>','<strong><em>','</em></strong>')|raw }} {{ 'Installation_SeeBelowForMoreInfo'|translate }}
{% elseif infos.has_warnings %}
<img src="plugins/Zeitgeist/images/warning.png"/>
{{ 'Installation_SystemCheckSummaryThereWereWarnings'|translate }} {{ 'Installation_SeeBelowForMoreInfo'|translate }}
{% else %}
<img src="plugins/Zeitgeist/images/ok.png"/>
<h2 piwik-enriched-headline>{{ title }}</h2>
{% if diagnosticReport.hasErrors() %}
<div class="alert alert-danger">
{{ 'Installation_SystemCheckSummaryThereWereErrors'|translate('<strong>','</strong>','<strong><em>','</em></strong>')|raw }}
{{ 'Installation_SeeBelowForMoreInfo'|translate }}
</div>
{% elseif diagnosticReport.hasWarnings() %}
<div class="alert alert-warning">
{{ 'Installation_SystemCheckSummaryThereWereWarnings'|translate }}
{{ 'Installation_SeeBelowForMoreInfo'|translate }}
</div>
{% else %}
<div class="alert alert-success">
{{ 'Installation_SystemCheckSummaryNoProblems'|translate }}
{% endif %}
</p>
</div>
{% endif %}
{% include "@Installation/_systemCheckSection.twig" %}
{% endif %}
{% endblock %}

91
www/analytics/plugins/Installation/templates/tablesCreation.twig
View file

@ -2,60 +2,55 @@
{% block content %}
<h2>{{ 'Installation_Tables'|translate }}</h2>
<h2>{{ 'Installation_Tables'|translate }}</h2>
{% if someTablesInstalled is defined %}
<div class="warning">{{ 'Installation_TablesWithSameNamesFound'|translate("<span id='linkToggle'>","</span>")|raw }}
<img src="plugins/Zeitgeist/images/warning_medium.png"/>
</div>
<div id="toggle" style="display:none;color:#4F2410;font-size: small;">
<em>{{ 'Installation_TablesFound'|translate }}: <br/>
{{ tablesInstalled }} </em>
</div>
{% if showReuseExistingTables is defined %}
<p>{{ 'Installation_TablesWarningHelp'|translate }}</p>
<p class="nextStep"><a href="{{ linkTo({'action':'reuseTables'}) }}">{{ 'Installation_TablesReuse'|translate }} &raquo;</a></p>
{% else %}
<p class="nextStep"><a href="{{ linkTo({'action':previousPreviousModuleName}) }}">&laquo; {{ 'Installation_GoBackAndDefinePrefix'|translate }}</a></p>
{% if someTablesInstalled is defined %}
<div class="alert alert-warning">
{{ 'Installation_TablesWithSameNamesFound'|translate("<span id='linkToggle'>","</span>")|raw }}
</div>
<p>
{{ 'Installation_TablesFound'|translate }}:
</p>
<p>
<em>{{ tablesInstalled }} </em>
</p>
{% if showReuseExistingTables is defined %}
<p>{{ 'Installation_TablesWarningHelp'|translate }}</p>
<p class="next-step">
<a href="{{ linkTo({'action':'reuseTables'}) }}">{{ 'Installation_TablesReuse'|translate }} &raquo;</a>
</p>
{% else %}
<p class="next-step">
<a href="{{ linkTo({'action':previousPreviousModuleName}) }}">&laquo; {{ 'Installation_GoBackAndDefinePrefix'|translate }}</a>
</p>
{% endif %}
<p class="next-step">
<a href="{{ linkTo({'deleteTables':1}) }}" id="eraseAllTables">{{ 'Installation_TablesDelete'|translate }} &raquo;</a>
</p>
{% endif %}
<p class="nextStep"><a href="{{ linkTo({'deleteTables':1}) }}" id="eraseAllTables">{{ 'Installation_TablesDelete'|translate }} &raquo;</a></p>
{% endif %}
{% if existingTablesDeleted is defined %}
<div class="success"> {{ 'Installation_TablesDeletedSuccess'|translate }}
<img src="plugins/Zeitgeist/images/success_medium.png"/></div>
{% endif %}
{% if existingTablesDeleted is defined %}
<div class="alert alert-success">
{{ 'Installation_TablesDeletedSuccess'|translate }}
</div>
{% endif %}
{% if tablesCreated is defined %}
<div class="success"> {{ 'Installation_TablesCreatedSuccess'|translate }}
<img src="plugins/Zeitgeist/images/success_medium.png"/></div>
{% endif %}
{% if tablesCreated is defined %}
<div class="alert alert-success">
{{ 'Installation_TablesCreatedSuccess'|translate }}
</div>
{% endif %}
<script>
$(document).ready(function () {
var strConfirmEraseTables = "{{ 'Installation_ConfirmDeleteExistingTables'|translate("["~tablesInstalled~"]") }} ";
<script>
$(document).ready(function () {
var strConfirmEraseTables = "{{ 'Installation_ConfirmDeleteExistingTables'|translate("["~tablesInstalled~"]") }} ";
// toggle the display of the tables detected during the installation when clicking
// on the span "linkToggle"
$("#linkToggle")
.css("border-bottom", "thin dotted #ff5502")
.hover(function () {
$(this).css({ cursor: "pointer"});
},
function () {
$(this).css({ cursor: "auto"});
})
.css("border-bottom", "thin dotted #ff5502")
.click(function () {
$("#toggle").toggle();
$("#eraseAllTables").click(function () {
if (!confirm(strConfirmEraseTables)) {
return false;
}
});
$("#eraseAllTables").click(function () {
if (!confirm(strConfirmEraseTables)) {
return false;
}
});
});
</script>
</script>
{% endblock %}

28
www/analytics/plugins/Installation/templates/trackingCode.twig
View file

@ -1,17 +1,21 @@
{% extends '@Installation/layout.twig' %}
{% block content %}
{% if displayfirstWebsiteSetupSuccess is defined %}
<span id="toFade" class="success">
{{ 'Installation_SetupWebsiteSetupSuccess'|translate(displaySiteName) }}
<img src="plugins/Zeitgeist/images/success_medium.png"/>
</span>
{% endif %}
{{ trackingHelp|raw }}
<br/><br/>
<h2>{{ 'Installation_LargePiwikInstances'|translate }}</h2>
{{ 'Installation_JsTagArchivingHelp1'|translate('<a target="_blank" href="http://piwik.org/docs/setup-auto-archiving/">','</a>')|raw }}
{{ 'General_ReadThisToLearnMore'|translate('<a target="_blank" href="http://piwik.org/docs/optimize/">','</a>')|raw }}
{% if displayfirstWebsiteSetupSuccess is defined %}
<div id="feedback" class="alert alert-success">
{{ 'Installation_SetupWebsiteSetupSuccess'|translate(displaySiteName) }}
</div>
{% endif %}
{% endblock %}
{{ trackingHelp|raw }}
<h3>{{ 'Installation_LargePiwikInstances'|translate }}</h3>
<p>
{{ 'Installation_JsTagArchivingHelp1'|translate('<a rel="noreferrer" target="_blank" href="http://piwik.org/docs/setup-auto-archiving/">','</a>')|raw }}
</p>
<p>
{{ 'General_ReadThisToLearnMore'|translate('<a rel="noreferrer" target="_blank" href="http://piwik.org/docs/optimize/">','</a>')|raw }}
</p>
{% endblock %}

63
www/analytics/plugins/Installation/templates/welcome.twig
View file

@ -1,45 +1,34 @@
{% extends '@Installation/layout.twig' %}
{% block content %}
<h2>{{ 'Installation_Welcome'|translate }}</h2>
{% if newInstall %}
<h2>{{ 'Installation_Welcome'|translate }}</h2>
{{ 'Installation_WelcomeHelp'|translate(totalNumberOfSteps)|raw }}
{% else %}
<p>{{ 'Installation_ConfigurationHelp'|translate }}</p>
<br/>
<div class="error">
{{ errorMessage }}
</div>
{% endif %}
<script type="text/javascript">
<!--
$(function () {
// client-side test for https to handle the case where the server is behind a reverse proxy
if (document.location.protocol === 'https:') {
$('p.nextStep a').attr('href', $('p.nextStep a').attr('href') + '&clientProtocol=https');
}
// client-side test for broken tracker (e.g., mod_security rule)
$('p.nextStep').hide();
$.ajax({
url: 'piwik.php',
data: 'url=http://example.com',
complete: function () {
$('p.nextStep').show();
},
error: function (req) {
$('p.nextStep a').attr('href', $('p.nextStep a').attr('href') + '&trackerStatus=' + req.status);
}
<script type="text/javascript">
<!--
$(function () {
// client-side test for broken tracker (e.g., mod_security rule)
$('.next-step').hide();
$.ajax({
url: 'piwik.php',
data: 'url=http://example.com',
complete: function () {
$('.next-step').show();
},
error: function (req) {
$('.next-step a').attr('href', $('.next-step a').attr('href') + '&trackerStatus=' + req.status);
}
});
});
});
//-->
</script>
//-->
</script>
{% if not showNextStep %}
<p class="nextStep">
<a href="{{url}}">{{ 'General_RefreshPage'|translate }} &raquo;</a>
</p>
{% endif %}
{% endblock %}
{% if not showNextStep %}
<p class="next-step">
<a href="{{ url }}">{{ 'General_RefreshPage'|translate }} &raquo;</a>
</p>
{% endif %}
{% endblock %}