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

8
www/analytics/plugins/Dashboard/templates/_dashboardSettings.twig
View file

@ -1,12 +1,12 @@
<span>{{ 'Dashboard_WidgetsAndDashboard'|translate }}</span>
<ul class="submenu">
<a class="title" title="{{ 'Dashboard_ManageDashboard'|translate|e('html_attr') }}" tabindex="4"><span class="icon icon-arrow-bottom"></span>{{ 'Dashboard_Dashboard'|translate }} </a>
<ul class="dropdown submenu">
<li>
<div class="addWidget">{{ 'Dashboard_AddAWidget'|translate }} &darr;</div>
<div class="addWidget">{{ 'Dashboard_AddAWidget'|translate }}</div>
<ul class="widgetpreview-categorylist"></ul>
</li>
{% if dashboardActions|length > 0 %}
<li>
<div class="manageDashboard">{{ 'Dashboard_ManageDashboard'|translate }} &darr;</div>
<div class="manageDashboard">{{ 'Dashboard_ManageDashboard'|translate }}</div>
<ul>
{% for action, title in dashboardActions %}
<li data-action="{{ action }}">{{ title|translate }}</li>

6
www/analytics/plugins/Dashboard/templates/_header.twig
View file

@ -1,8 +1,10 @@
{# This header is for loading the dashboard in stand alone mode #}
<!DOCTYPE html>
<html>
<html id="ng-app" ng-app="piwikApp">
<head>
<meta charset="utf-8">
<meta name="robots" content="noindex,nofollow">
<meta http-equiv="x-ua-compatible" content="IE=EDGE,chrome=1" >
<title>{{ 'Dashboard_Dashboard'|translate }} - {{ 'CoreHome_WebAnalyticsReports'|translate }}</title>
<!--[if lt IE 9]>
@ -13,4 +15,4 @@
{% include "_jsGlobalVariables.twig" %}
{% include "_jsCssIncludes.twig" %}
</head>
<body id="standalone">
<body id="standalone" ng-app="app">

46
www/analytics/plugins/Dashboard/templates/_widgetFactoryTemplate.twig
View file

@ -1,22 +1,28 @@
<div id="widgetTemplate" style="display:none;">
<div class="widget">
<div class="widgetTop">
<div class="button" id="close">
<img src="plugins/Zeitgeist/images/close.png" title="{{ 'General_Close'|translate }}" />
</div>
<div class="button" id="maximise">
<img src="plugins/Zeitgeist/images/maximise.png" title="{{ 'Dashboard_Maximise'|translate }}" />
</div>
<div class="button" id="minimise">
<img src="plugins/Zeitgeist/images/minimise.png" title="{{ 'Dashboard_Minimise'|translate }}" />
</div>
<div class="button" id="refresh">
<img src="plugins/Zeitgeist/images/refresh.png" title="{{ 'General_Refresh'|translate }}" />
</div>
<div class="widgetName">{% if widgetName is defined %}{{ widgetName }}{% endif %}</div>
<div class="widget">
<div class="widgetTop">
<div class="buttons">
<div class="button" id="close">
<span class="icon-close" title="{{ 'General_Close'|translate }}"></span>
</div>
<div class="button" id="maximise">
<span class="icon-fullscreen" title="{{ 'Dashboard_Maximise'|translate }}"></span>
</div>
<div class="button" id="minimise">
<span class="icon-minimise" title="{{ 'Dashboard_Minimise'|translate }}"></span>
</div>
<div class="button" id="refresh">
<span class="icon-reload" title="{{ 'General_Refresh'|translate }}"></span>
</div>
</div>
<h3 class="widgetName">{% if widgetName is defined %}{{ widgetName }}{% endif %}
<div class="widgetNameOffScreen">
{{ 'General_Widget'|translate }}
</div>
</h3>
</div>
<div class="widgetContent">
<div class="widgetLoading">{{ 'Dashboard_LoadingWidget'|translate }}</div>
</div>
</div>
<div class="widgetContent">
<div class="widgetLoading">{{ 'Dashboard_LoadingWidget'|translate }}</div>
</div>
</div>
</div>
</div>

14
www/analytics/plugins/Dashboard/templates/embeddedIndex.twig
View file

@ -76,9 +76,17 @@
<div id="createDashboardNameInput">
<label>{{ 'Dashboard_DashboardName'|translate }} <input type="input" name="newDashboardName" id="createDashboardName" value=""/></label><br/>
<label><input type="radio" checked="checked" name="type" value="default" id="dashboard_type_default">{{ 'Dashboard_DefaultDashboard'|translate }}
</label><br/>
<label><input type="radio" name="type" value="empty" id="dashboard_type_empty">{{ 'Dashboard_EmptyDashboard'|translate }}</label>
<label for="dashboard_type_default">
<input type="radio" checked="checked" name="type" value="default" id="dashboard_type_default" />
{{ 'Dashboard_DefaultDashboard'|translate }}
</label>
<br/><br/>
<label for="dashboard_type_empty">
<input type="radio" name="type" value="empty" id="dashboard_type_empty" />
{{ 'Dashboard_EmptyDashboard'|translate }}
</label>
</div>
<input role="yes" type="button" value="{{ 'General_Yes'|translate }}"/>
<input role="no" type="button" value="{{ 'General_Cancel'|translate }}"/>

5
www/analytics/plugins/Dashboard/templates/index.twig
View file

@ -3,11 +3,12 @@
{% include "@CoreHome/_periodSelect.twig" %}
{{ postEvent("Template.nextToCalendar") }}
{% render dashboardSettingsControl %}
<div id="Dashboard" class="piwikTopControl">
<div id="Dashboard" class="piwikTopControl borderedControl piwikSelector">
<ul>
{% for dashboard in dashboards %}
<li class="dashboardMenuItem" id="Dashboard_embeddedIndex_{{ dashboard.iddashboard }}">
<a href="javascript:$('#dashboardWidgetsArea').dashboard('loadDashboard', {{ dashboard.iddashboard }});">{{ dashboard.name|escape }}</a>
<a href="javascript:$('#dashboardWidgetsArea').dashboard('loadDashboard', {{ dashboard.iddashboard }});"
class="title">{{ dashboard.name|escape }}</a>
</li>
{% endfor %}
</ul>