update Piwik to version 2.16 (fixes #91)

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

View file

@ -1,5 +1,7 @@
{% extends 'admin.twig' %}
{% set title %}{{ 'DevicesDetection_DeviceDetection'|translate }}{% endset %}
{% block content %}
<script type="text/javascript">
@ -25,27 +27,35 @@
</script>
<style type="text/css">
textarea {
width: 700px;
display: block;
}
.detection {
padding-top:10px;
}
.detection td {
width: 50%;
}
.detection td img {
margin-right: 10px;
}
</style>
<h1>{{ 'DevicesDetection_DeviceDetection'|translate }}</h1>
<h2>{{ 'DevicesDetection_UserAgent'|translate }}</h2>
<h2>{{ title }}</h2>
<h3>{{ 'DevicesDetection_UserAgent'|translate }}</h3>
<br />
<form action="{{ linkTo({}) }}" method="POST">
<textarea name="ua">{{ userAgent }}</textarea>
<br />
<input type="submit" value="{{ 'General_Refresh'|translate }}" />
</form>
<h2>{{ 'UserSettings_ColumnOperatingSystem'|translate }}</h2>
<table class="dataTable detection">
<h3>{{ 'DevicesDetection_ColumnOperatingSystem'|translate }}</h3>
<table class="simple-table detection">
<tr>
<td>{{ 'General_Name'|translate }} <small>(<a href="javascript:showList('os');">{{ 'Mobile_ShowAll'|translate }}</a>)</small></td>
<td><img src="{{ os_logo }}" />{{ os_name }}</td>
@ -55,13 +65,13 @@
<td>{{ os_version }}</td>
</tr>
<tr>
<td>{{ 'UserSettings_OperatingSystemFamily'|translate }} <small>(<a href="javascript:showList('osfamilies');">{{ 'Mobile_ShowAll'|translate }}</a>)</small></td>
<td>{{ 'DevicesDetection_OperatingSystemFamily'|translate }} <small>(<a href="javascript:showList('osfamilies');">{{ 'Mobile_ShowAll'|translate }}</a>)</small></td>
<td><img src="{{ os_family_logo }}" />{{ os_family }}</td>
</tr>
</table>
<h2>{{ 'UserSettings_ColumnBrowser'|translate }}</h2>
<table class="dataTable detection">
<h3>{{ 'DevicesDetection_ColumnBrowser'|translate }}</h3>
<table class="simple-table detection">
<tr>
<td>{{ 'General_Name'|translate }} <small>(<a href="javascript:showList('browsers');">{{ 'Mobile_ShowAll'|translate }}</a>)</small></td>
<td><img src="{{ browser_logo }}" />{{ browser_name }}</td>
@ -71,13 +81,13 @@
<td>{{ browser_version }}</td>
</tr>
<tr>
<td>{{ 'UserSettings_ColumnBrowserFamily'|translate }} <small>(<a href="javascript:showList('browserfamilies');">{{ 'Mobile_ShowAll'|translate }}</a>)</small></td>
<td>{{ 'DevicesDetection_BrowserFamily'|translate }} <small>(<a href="javascript:showList('browserfamilies');">{{ 'Mobile_ShowAll'|translate }}</a>)</small></td>
<td><img src="{{ browser_family_logo }}" />{{ browser_family }}</td>
</tr>
</table>
<h2>{{ 'DevicesDetection_Device'|translate }}</h2>
<table class="dataTable detection">
<h3>{{ 'DevicesDetection_Device'|translate }}</h3>
<table class="simple-table detection">
<tr>
<td>{{ 'DevicesDetection_dataTableLabelTypes'|translate }} <small>(<a href="javascript:showList('devicetypes');">{{ 'Mobile_ShowAll'|translate }}</a>)</small></td>
<td><img src="{{ device_type_logo }}" />{{ device_type }}</td>

View file

@ -0,0 +1,19 @@
<div class="row">
<div class="col-md-6">
<h2 piwik-enriched-headline>{{ "DevicesDetection_DeviceType"|translate }}</h2>
{{ deviceTypes | raw}}
<h2 piwik-enriched-headline>{{ "DevicesDetection_DeviceBrand"|translate }}</h2>
{{ deviceBrands | raw }}
</div>
<div class="col-md-6">
<h2 piwik-enriched-headline>{{ "DevicesDetection_DeviceModel"|translate }}</h2>
{{ deviceModels | raw }}
{% if resolutions|default is not empty %}
<h2 piwik-enriched-headline>{{ 'Resolution_Resolutions'|translate }}</h2>
{{ resolutions|raw }}
{% endif %}
</div>
</div>

View file

@ -1,15 +0,0 @@
<div id='leftcolumn'>
<h2 piwik-enriched-headline>{{ "DevicesDetection_DeviceType"|translate }}</h2>
{{ deviceTypes | raw}}
<h2 piwik-enriched-headline>{{ "DevicesDetection_DeviceBrand"|translate }}</h2>
{{ deviceBrands | raw }}
<h2 piwik-enriched-headline>{{ "DevicesDetection_DeviceModel"|translate }}</h2>
{{ deviceModels | raw }}
</div>
<div id='rightcolumn'>
<h2 piwik-enriched-headline>{{ "DevicesDetection_OperatingSystemFamilies"|translate }}</h2>
{{ osReport | raw}}
<h2 piwik-enriched-headline>{{ "UserSettings_BrowserFamilies"|translate }}</h2>
{{ browserReport | raw }}
</div>

View file

@ -0,0 +1,23 @@
<div class="row">
<div class="col-md-6">
<h2 piwik-enriched-headline>{{ "DevicesDetection_OperatingSystems"|translate }}</h2>
{{ osReport | raw}}
{% if configurations|default is not empty %}
<h2 piwik-enriched-headline>{{ 'Resolution_Configurations'|translate }}</h2>
{{ configurations|raw }}
{% endif %}
</div>
<div class="col-md-6">
<h2 piwik-enriched-headline>{{ "DevicesDetection_Browsers"|translate }}</h2>
{{ browserReport | raw }}
<h2 piwik-enriched-headline>{{ "DevicesDetection_BrowserEngines"|translate }}</h2>
{{ browserEngineReport | raw }}
{% if browserPlugins|default is not empty %}
<h2 piwik-enriched-headline>{{ 'General_Plugins'|translate }}</h2>
{{ browserPlugins|raw }}
{% endif %}
</div>
</div>