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

2
www/analytics/plugins/UserCountryMap/templates/realtimeMap.twig
View file

@ -21,7 +21,7 @@
</div>
<div class="RealTimeMap_meta">
<span class="loadingPiwik">
<img src="plugins/Zeitgeist/images/loading-blue.gif"> {{ 'General_LoadingData'|translate }}...
<img src="plugins/Morpheus/images/loading-blue.gif"> {{ 'General_LoadingData'|translate }}...
</span>
</div>

22
www/analytics/plugins/UserCountryMap/templates/visitorMap.twig
View file

@ -1,3 +1,4 @@
<section>
<div class="UserCountryMap" style="position:relative; overflow:hidden;">
<div class="UserCountryMap_container">
<div class="UserCountryMap_map" style="overflow:hidden;"></div>
@ -22,7 +23,7 @@
<div class="pk-emptyDataTable">{{ 'CoreHome_ThereIsNoDataForThisReport'|translate }}</div>
{% else %}
<span class="loadingPiwik">
<img src="plugins/Zeitgeist/images/loading-blue.gif" />
<img src="plugins/Morpheus/images/loading-blue.gif" />
{{ 'General_LoadingData'|translate }}...
</span>
{% endif %}
@ -30,12 +31,12 @@
<div class="dataTableFeatures" style="padding-top:0;">
<div class="dataTableFooterIcons">
<div class="dataTableFooterWrap" var="graphVerticalBar">
<img class="UserCountryMap-activeItem dataTableFooterActiveItem" src="plugins/Zeitgeist/images/data_table_footer_active_item.png" style="left: 25px;" />
<img class="UserCountryMap-activeItem dataTableFooterActiveItem" src="plugins/Morpheus/images/data_table_footer_active_item.png" style="left: 25px;" />
<div class="tableIconsGroup">
<span class="tableAllColumnsSwitch">
<a class="UserCountryMap-btn-zoom tableIcon" format="table">
<img src="plugins/Zeitgeist/images/zoom-out.png" title="Zoom to world" />
<img src="plugins/Morpheus/images/zoom-out.png" title="Zoom to world" />
</a>
</span>
</div>
@ -54,25 +55,23 @@
</div>
</div>
<select class="userCountryMapSelectMetrics" style="float:right;margin-right:0;margin-bottom:5px;max-width: 9em;font-size:10px;">
<select class="userCountryMapSelectMetrics" style="float:right;margin-right:0;margin-bottom:5px;max-width: 10em;font-size:10px;">
{% for metric in metrics %}
<option value="{{ metric[0] }}" {% if metric[0] == defaultMetric %}selected="selected"{% endif %}}>{{ metric[1] }}</option>
{% endfor %}
</select>
<select class="userCountryMapSelectCountry" style="float:right;margin-right:5px;margin-bottom:5px; max-width: 9em;font-size:10px;">
<select class="userCountryMapSelectCountry">
<option value="world">{{ 'UserCountryMap_WorldWide'|translate }}</option>
<option disabled="disabled">––––––</option>
<option value="AF">{{ 'UserCountry_continent_afr'|translate }}</option>
<option value="AS">{{ 'UserCountry_continent_asi'|translate }}</option>
<option value="EU">{{ 'UserCountry_continent_eur'|translate }}</option>
<option value="NA">{{ 'UserCountry_continent_amn'|translate }}</option>
<option value="OC">{{ 'UserCountry_continent_oce'|translate }}</option>
<option value="SA">{{ 'UserCountry_continent_ams'|translate }}</option>
{% for code,continent in continents %}
<option value="{{ code }}">{{ continent }}</option>
{% endfor %}
<option disabled="disabled">––––––</option>
</select>
</div>
</div>
</div>
</section>
{% if not noData %}
<!-- configure some piwik vars -->
@ -81,6 +80,7 @@
config = JSON.parse('{{ config|e('js') }}');
config._ = JSON.parse('{{ localeJSON|e('js') }}');
config.reqParams = JSON.parse('{{ reqParamsJSON|e('js') }}');
config.countryNames = JSON.parse('{{ countriesByIso|json_encode|e('js') }}');
$('.UserCountryMap').addClass('dataTable');