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
|
|
@ -17,11 +17,9 @@
|
|||
<td width="150">{{ 'UserCountry_LocationDatabase'|translate }}</td>
|
||||
<td><input type="text" id="geoip-location-db" value="{{ geoIPLocUrl }}"/></td>
|
||||
<td width="164">
|
||||
{% set locationHint %}
|
||||
{{ 'UserCountry_LocationDatabaseHint'|translate }}
|
||||
{% endset %}
|
||||
{% import 'macros.twig' as piwik %}
|
||||
{{ piwik.inlineHelp(locationHint) }}
|
||||
<div class="form-help">
|
||||
{{ 'UserCountry_LocationDatabaseHint'|translate }}
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
@ -36,24 +34,23 @@
|
|||
<td width="150">{{ 'UserCountry_DownloadNewDatabasesEvery'|translate }}</td>
|
||||
<td id="geoip-update-period-cell">
|
||||
<input type="radio" name="geoip-update-period" value="month" id="geoip-update-period-month" {% if geoIPUpdatePeriod == 'month' %}checked="checked"{% endif %} />
|
||||
<label for="geoip-update-period-month">{{ 'CoreHome_PeriodMonth'|translate }}</label>
|
||||
|
||||
<label for="geoip-update-period-month">{{ 'Intl_PeriodMonth'|translate }}</label>
|
||||
|
||||
<input type="radio" name="geoip-update-period" value="week" id="geoip-update-period-week" {% if geoIPUpdatePeriod == 'week' %}checked="checked"{% endif %}/>
|
||||
<label for="geoip-update-period-week">{{ 'CoreHome_PeriodWeek'|translate }}</label>
|
||||
<label for="geoip-update-period-week">{{ 'Intl_PeriodWeek'|translate }}</label>
|
||||
</td>
|
||||
<td width="164">
|
||||
{% set lastTimeRunNote %}
|
||||
{% if lastTimeUpdaterRun is defined and lastTimeUpdaterRun is not empty %}
|
||||
{{ 'UserCountry_UpdaterWasLastRun'|translate(lastTimeUpdaterRun)|raw }}
|
||||
{% else %}
|
||||
{{ 'UserCountry_UpdaterHasNotBeenRun'|translate }}
|
||||
{% endif %}
|
||||
<br/><br/>
|
||||
<div id="geoip-updater-next-run-time">
|
||||
{% include "@UserCountry/_updaterNextRunTime.twig" %}
|
||||
</div>
|
||||
{% endset %}
|
||||
{{ piwik.inlineHelp(lastTimeRunNote) }}
|
||||
<div class="form-help">
|
||||
{% if lastTimeUpdaterRun is defined and lastTimeUpdaterRun is not empty %}
|
||||
{{ 'UserCountry_UpdaterWasLastRun'|translate(lastTimeUpdaterRun)|raw }}
|
||||
{% else %}
|
||||
{{ 'UserCountry_UpdaterHasNotBeenRun'|translate }}
|
||||
{% endif %}
|
||||
<br/><br/>
|
||||
<div id="geoip-updater-next-run-time">
|
||||
{% include "@UserCountry/_updaterNextRunTime.twig" %}
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
{% extends 'admin.twig' %}
|
||||
|
||||
{% set title %}{{ 'UserCountry_Geolocation'|translate }}{% endset %}
|
||||
|
||||
{% block content %}
|
||||
{% import 'macros.twig' as piwik %}
|
||||
|
||||
<h2 piwik-enriched-headline
|
||||
help-url="http://piwik.org/docs/geo-locate/"
|
||||
id="location-providers">{{ 'UserCountry_Geolocation'|translate }}</h2>
|
||||
id="location-providers">{{ title }}</h2>
|
||||
|
||||
<div style="width:900px;">
|
||||
|
||||
|
|
@ -15,7 +17,7 @@
|
|||
<h3 style="margin-top:0;">{{ 'UserCountry_HowToSetupGeoIP'|translate }}</h3>
|
||||
<p>{{ 'UserCountry_HowToSetupGeoIPIntro'|translate }}</p>
|
||||
<ul style="list-style:disc;margin-left:2em;">
|
||||
<li>{{ 'UserCountry_HowToSetupGeoIP_Step1'|translate('<a href="http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz">','</a>','<a target="_blank" href="http://www.maxmind.com/?rId=piwik">','</a>')|raw }}</li>
|
||||
<li>{{ 'UserCountry_HowToSetupGeoIP_Step1'|translate('<a href="http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz">','</a>','<a rel="noreferrer" target="_blank" href="http://www.maxmind.com/?rId=piwik">','</a>')|raw }}</li>
|
||||
<li>{{ 'UserCountry_HowToSetupGeoIP_Step2'|translate("'GeoLiteCity.dat'",'<strong>','</strong>')|raw }}</li>
|
||||
<li>{{ 'UserCountry_HowToSetupGeoIP_Step3'|translate('<strong>','</strong>','<span style="color:green"><strong>','</strong></span>')|raw }}</li>
|
||||
<li>{{ 'UserCountry_HowToSetupGeoIP_Step4'|translate }}</li>
|
||||
|
|
@ -36,7 +38,7 @@
|
|||
<input class="location-provider" name="location-provider" value="{{ id }}" type="radio" {% if currentProviderId == id %}checked="checked"{% endif %}
|
||||
id="provider_input_{{ id }}" {% if provider.status != 1 %}disabled="disabled"{% endif %}/>
|
||||
<label for="provider_input_{{ id }}">{{ provider.title|translate }}</label><br/>
|
||||
<span class="loadingPiwik" style="display:none;"><img src="./plugins/Zeitgeist/images/loading-blue.gif"/></span>
|
||||
<span class="loadingPiwik" style="display:none;"><img src="./plugins/Morpheus/images/loading-blue.gif"/></span>
|
||||
<span class="success" ></span>
|
||||
</p>
|
||||
|
||||
|
|
@ -60,36 +62,32 @@
|
|||
</td>
|
||||
<td width="164">
|
||||
{% if provider.status == 1 %}
|
||||
{% set currentLocation %}
|
||||
<div class="form-help">
|
||||
{% if thisIP != '127.0.0.1' %}
|
||||
{{ 'UserCountry_CurrentLocationIntro'|translate }}:
|
||||
<div style="text-align:left;">
|
||||
<div>
|
||||
<br/>
|
||||
<span class="loadingPiwik" style="display:none;position:absolute;">
|
||||
<img src="./plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'General_Loading'|translate }}</span>
|
||||
<span class="location"><strong><em>{{ provider.location|raw }}</em></strong></span>
|
||||
<img src="./plugins/Morpheus/images/loading-blue.gif"/> {{ 'General_Loading'|translate }}</span>
|
||||
<span class="location"><strong>{{ provider.location|raw }}</strong></span>
|
||||
</div>
|
||||
<div style="text-align:right;">
|
||||
<div class="text-right">
|
||||
<a href="#" class="refresh-loc" data-impl-id="{{ id }}"><em>{{ 'General_Refresh'|translate }}</em></a>
|
||||
</div>
|
||||
{% else %}
|
||||
{{ 'UserCountry_CannotLocalizeLocalIP'|translate(thisIP) }}
|
||||
{% endif %}
|
||||
{% endset %}
|
||||
{{ piwik.inlineHelp(currentLocation) }}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if provider.statusMessage is defined and provider.statusMessage %}
|
||||
{% set brokenReason %}
|
||||
{% if provider.status == 2 %}<strong><em>{{ 'General_Error'|translate }}:</em></strong> {% endif %}{{ provider.statusMessage|raw }}
|
||||
{% endset %}
|
||||
{{ piwik.inlineHelp(brokenReason) }}
|
||||
<div class="form-help">
|
||||
{% if provider.status == 2 %}<strong>{{ 'General_Error'|translate }}:</strong> {% endif %}{{ provider.statusMessage|raw }}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% if provider.extra_message is defined and provider.extra_message %}
|
||||
{% set extraMessage %}
|
||||
<div class="form-help">
|
||||
{{ provider.extra_message|raw }}
|
||||
{% endset %}
|
||||
<br/>
|
||||
{{ piwik.inlineHelp(extraMessage) }}
|
||||
</div>
|
||||
{% endif %}
|
||||
</td>
|
||||
{% endfor %}
|
||||
|
|
@ -120,7 +118,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<div id="geoipdb-screen2-download" style="display:none;">
|
||||
<p class='loadingPiwik'><img src='./plugins/Zeitgeist/images/loading-blue.gif'/>
|
||||
<p class='loadingPiwik'><img src='./plugins/Morpheus/images/loading-blue.gif'/>
|
||||
{{ 'UserCountry_DownloadingDb'|translate('<a href="'~geoLiteUrl~'">GeoLiteCity.dat</a>')|raw }}...</p>
|
||||
<div id="geoip-download-progress"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,26 +1,29 @@
|
|||
<div id="leftcolumn">
|
||||
{{ postEvent("Template.leftColumnUserCountry") }}
|
||||
<div class="row">
|
||||
|
||||
<h2 piwik-enriched-headline>{{ 'UserCountry_Continent'|translate }}</h2>
|
||||
{{ dataTableContinent|raw }}
|
||||
<div class="col-md-6">
|
||||
{{ postEvent("Template.leftColumnUserCountry") }}
|
||||
|
||||
<div class="sparkline">
|
||||
{{ sparkline(urlSparklineCountries) }}
|
||||
{{ 'UserCountry_DistinctCountries'|translate("<strong>"~numberDistinctCountries~"</strong>")|raw }}
|
||||
<h2 piwik-enriched-headline>{{ 'UserCountry_Continent'|translate }}</h2>
|
||||
{{ dataTableContinent|raw }}
|
||||
|
||||
<div class="sparkline">
|
||||
{{ sparkline(urlSparklineCountries) }}
|
||||
{{ 'UserCountry_DistinctCountries'|translate("<strong>"~numberDistinctCountries|number~"</strong>")|raw }}
|
||||
</div>
|
||||
<div style="clear:left"></div>
|
||||
|
||||
{{ postEvent("Template.footerUserCountry") }}
|
||||
</div>
|
||||
|
||||
{{ postEvent("Template.footerUserCountry") }}
|
||||
<div class="col-md-6">
|
||||
<h2 piwik-enriched-headline>{{ 'UserCountry_Country'|translate }}</h2>
|
||||
{{ dataTableCountry|raw }}
|
||||
|
||||
<h2 piwik-enriched-headline>{{ 'UserCountry_Region'|translate }}</h2>
|
||||
{{ dataTableRegion|raw }}
|
||||
|
||||
<h2 piwik-enriched-headline>{{ 'UserCountry_City'|translate }}</h2>
|
||||
{{ dataTableCity|raw }}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="rightcolumn">
|
||||
<h2 piwik-enriched-headline>{{ 'UserCountry_Country'|translate }}</h2>
|
||||
{{ dataTableCountry|raw }}
|
||||
|
||||
<h2 piwik-enriched-headline>{{ 'UserCountry_Region'|translate }}</h2>
|
||||
{{ dataTableRegion|raw }}
|
||||
|
||||
<h2 piwik-enriched-headline>{{ 'UserCountry_City'|translate }}</h2>
|
||||
{{ dataTableCity|raw }}
|
||||
</div>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue