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
|
|
@ -1,7 +1,4 @@
|
|||
<div class="entityAddContainer" style="display:none;">
|
||||
<div class='entityCancel'>
|
||||
{{ 'ScheduledReports_CancelAndReturnToReports'|translate("<a class='entityCancelLink'>","</a>")|raw }}
|
||||
</div>
|
||||
<div class='clear'></div>
|
||||
<form id='addEditReport'>
|
||||
<table class="dataTable entityTable">
|
||||
|
|
@ -41,7 +38,7 @@
|
|||
<div class="entityInlineHelp">
|
||||
{% set SegmentEditor_DefaultAllVisits %}{{ 'SegmentEditor_DefaultAllVisits'|translate }}{% endset %}
|
||||
{% set SegmentEditor_AddNewSegment %}{{ 'SegmentEditor_AddNewSegment'|translate }}{% endset %}
|
||||
{{ 'ScheduledReports_Segment_Help'|translate('<a href="./" target="_blank">','</a>',SegmentEditor_DefaultAllVisits,SegmentEditor_AddNewSegment)|raw }}
|
||||
{{ 'ScheduledReports_Segment_Help'|translate('<a href="./" rel="noreferrer" target="_blank">','</a>',SegmentEditor_DefaultAllVisits,SegmentEditor_AddNewSegment)|raw }}
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -62,9 +59,7 @@
|
|||
<br/>
|
||||
{{ 'ScheduledReports_MonthlyScheduleHelp'|translate }}
|
||||
<br/>
|
||||
{{ 'ScheduledReports_ReportHour'|translate }}
|
||||
<input type="text" style="height: 0.9em;padding-left: 5px;width: 35px;" id="report_hour" class="inp" size="2">
|
||||
{{ 'ScheduledReports_OClock'|translate }}
|
||||
{{ 'ScheduledReports_ReportHour'|translate('<input type="text" id="report_hour" class="inp" size="2">')|raw }}
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
|
|
@ -100,7 +95,7 @@
|
|||
|
||||
{{ postEvent("Template.reportParametersScheduledReports") }}
|
||||
|
||||
<tr id="row_report_display_options">
|
||||
<tr class='email' id="row_report_display_options">
|
||||
<td class="first">
|
||||
{# ScheduledReports_AggregateReportsFormat should be named ScheduledReports_DisplayFormat #}
|
||||
{{ 'ScheduledReports_AggregateReportsFormat'|translate }}
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
</tr>
|
||||
</thead>
|
||||
|
||||
{% if userLogin == 'anonymous' %}
|
||||
{% if userLogin == 'anonymous' %}
|
||||
<tr>
|
||||
<td colspan='7'>
|
||||
<br/>
|
||||
|
|
@ -21,18 +21,14 @@
|
|||
<br/><br/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
{% elseif reports is empty %}
|
||||
<tr>
|
||||
<td colspan='7'>
|
||||
<br/>
|
||||
{{ 'ScheduledReports_ThereIsNoReportToManage'|translate(siteName)|raw }}.
|
||||
<br/><br/>
|
||||
<a onclick='' id='linkAddReport'>› {{ 'ScheduledReports_CreateAndScheduleReport'|translate }}</a>
|
||||
<br/><br/>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<tr>
|
||||
<td colspan='7'>
|
||||
<br/>
|
||||
{{ 'ScheduledReports_ThereIsNoReportToManage'|translate(siteName)|raw }}.
|
||||
<br/><br/>
|
||||
</td>
|
||||
</tr>
|
||||
{% else %}
|
||||
{% for report in reports %}
|
||||
<tr>
|
||||
|
|
@ -62,7 +58,7 @@
|
|||
<br/>
|
||||
{% endfor %}
|
||||
{# send now link #}
|
||||
<a href="#" idreport="{{ report.idreport }}" name="linkSendNow" class="link_but" style="margin-top:3px;">
|
||||
<a href="#" idreport="{{ report.idreport }}" name="linkSendNow" class="link_but withIcon" style="margin-top:3px;">
|
||||
<img border=0 src='{{ reportTypes[report.type] }}'/>
|
||||
{{ 'ScheduledReports_SendReportNow'|translate }}
|
||||
</a>
|
||||
|
|
@ -70,34 +66,39 @@
|
|||
</td>
|
||||
<td>
|
||||
{# download link #}
|
||||
<a href="{{ linkTo({'module':'API', 'segment': null, 'token_auth':token_auth, 'method':'ScheduledReports.generateReport', 'idReport':report.idreport, 'outputType':downloadOutputType, 'language':language}) }}"
|
||||
target="_blank" name="linkDownloadReport" id="{{ report.idreport }}" class="link_but">
|
||||
<a href="{{ linkTo({'module':'API', 'segment': null, 'token_auth':token_auth,
|
||||
'method':'ScheduledReports.generateReport', 'idReport':report.idreport,
|
||||
'outputType':downloadOutputType, 'language':language,
|
||||
'format': (report.format in ['html', 'csv']) ? report.format : false
|
||||
}) }}"
|
||||
rel="noreferrer" target="_blank" name="linkDownloadReport" id="{{ report.idreport }}" class="link_but withIcon">
|
||||
<img src='{{ reportFormatsByReportType[report.type][report.format] }}' border="0"/>
|
||||
{{ 'General_Download'|translate }}
|
||||
</a>
|
||||
</td>
|
||||
<td>
|
||||
{# edit link #}
|
||||
<a href='#' name="linkEditReport" id="{{ report.idreport }}" class="link_but">
|
||||
<img src='plugins/Zeitgeist/images/ico_edit.png' border="0"/>
|
||||
{{ 'General_Edit'|translate }}
|
||||
</a>
|
||||
<td class="text-center">
|
||||
<button id="{{ report.idreport }}" class="edit-report btn btn-flat btn-lg" title="{{ 'General_Edit'|translate }}">
|
||||
<span class="icon-edit"></span>
|
||||
</button>
|
||||
</td>
|
||||
<td>
|
||||
{# delete link #}
|
||||
<a href='#' name="linkDeleteReport" id="{{ report.idreport }}" class="link_but">
|
||||
<img src='plugins/Zeitgeist/images/ico_delete.png' border="0"/>
|
||||
{{ 'General_Delete'|translate }}
|
||||
</a>
|
||||
<td class="text-center">
|
||||
<button id="{{ report.idreport }}" class="delete-report btn btn-flat btn-lg" title="{{ 'General_Delete'|translate }}">
|
||||
<span class="icon-delete"></span>
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
</table>
|
||||
|
||||
{% if userLogin != 'anonymous' %}
|
||||
<br/>
|
||||
<a onclick='' id='linkAddReport'>› {{ 'ScheduledReports_CreateAndScheduleReport'|translate }}</a>
|
||||
<br/>
|
||||
<br/>
|
||||
{% endif %}
|
||||
<p>
|
||||
<button id="add-report" class="btn btn-lg btn-flat">
|
||||
<span class="icon-add"></span>
|
||||
{{ 'ScheduledReports_CreateAndScheduleReport'|translate }}
|
||||
</button>
|
||||
</p>
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,16 +1,17 @@
|
|||
{% extends 'dashboard.twig' %}
|
||||
{% extends 'user.twig' %}
|
||||
|
||||
{% set title %}{{ 'ScheduledReports_PersonalEmailReports'|translate }}{% endset %}
|
||||
|
||||
{% block topcontrols %}
|
||||
{% include "@CoreHome/_siteSelectHeader.twig" %}
|
||||
{% include "@CoreHome/_periodSelect.twig" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
{% include "@CoreHome/_siteSelectHeader.twig" %}
|
||||
<div class="emailReports">
|
||||
<h2 piwik-enriched-headline help-url="http://piwik.org/docs/email-reports/">{{ title }}</h2>
|
||||
|
||||
<div class="top_controls">
|
||||
{% include "@CoreHome/_periodSelect.twig" %}
|
||||
</div>
|
||||
|
||||
<div class="centerLargeDiv">
|
||||
<h2 piwik-enriched-headline
|
||||
help-url="http://piwik.org/docs/email-reports/">{{ 'ScheduledReports_ManageEmailReports'|translate }}</h2>
|
||||
<span id="reportSentSuccess"></span>
|
||||
<span id="reportUpdatedSuccess"></span>
|
||||
|
||||
|
|
@ -53,10 +54,9 @@
|
|||
position:relative;
|
||||
}
|
||||
|
||||
.entityAddContainer > .entityCancel:first-child {
|
||||
position: absolute;
|
||||
right:0;
|
||||
bottom:100%;
|
||||
.emailReports .top_controls {
|
||||
padding-bottom: 18px;
|
||||
}
|
||||
|
||||
</style>
|
||||
{% endblock %}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue