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,4 +1,4 @@
<div id='entityEditContainer' style="display:none;">
<div id='entityEditContainer' class="managegoals" style="display:none;">
<table class="dataTable entityTable">
<thead>
<tr>
@ -6,36 +6,59 @@
<th>{{ 'Goals_GoalName'|translate }}</th>
<th>{{ 'Goals_GoalIsTriggeredWhen'|translate }}</th>
<th>{{ 'General_ColumnRevenue'|translate }}</th>
<th>{{ 'General_Edit'|translate }}</th>
<th>{{ 'General_Delete'|translate }}</th>
{% if userCanEditGoals %}
<th>{{ 'General_Edit'|translate }}</th>
<th>{{ 'General_Delete'|translate }}</th>
{% endif %}
</tr>
</thead>
{% for goal in goals %}
{% if goals is empty %}
<tr>
<td class="first">{{ goal.idgoal }}</td>
<td>{{ goal.name|raw }}</td>{# NOTE: goal names are escaped in the DB #}
<td><span class='matchAttribute'>{{ goal.match_attribute }}</span>
{% if goal.pattern_type is defined %}
<br/>
{{ 'Goals_Pattern'|translate }} {{ goal.pattern_type }}: {{ goal.pattern|raw }}
{% endif %}
</td>
<td>{% if goal.revenue==0 %}-{% else %}{{ goal.revenue|money(idSite)|raw }}{% endif %}</td>
<td>
<a href='#' name="linkEditGoal" id="{{ goal.idgoal }}" class="link_but">
<img src='plugins/Zeitgeist/images/ico_edit.png' border="0"/>
{{ 'General_Edit'|translate }}
</a>
</td>
<td>
<a href='#' name="linkDeleteGoal" id="{{ goal.idgoal }}" class="link_but">
<img src='plugins/Zeitgeist/images/ico_delete.png' border="0"/>
{{ 'General_Delete'|translate }}
</a>
<td colspan='7'>
<br/>
{{ 'Goals_ThereIsNoGoalToManage'|translate(siteName)|raw }}.
<br/><br/>
</td>
</tr>
{% endfor %}
{% else %}
{% for goal in goals %}
<tr>
<td class="first">{{ goal.idgoal }}</td>
<td>{{ goal.name }}</td>
<td><span class='matchAttribute'>{{ goal.match_attribute }}</span>
{% if goal.pattern_type is defined %}
<br/>
{{ 'Goals_Pattern'|translate }} {{ goal.pattern_type }}: {{ goal.pattern }}
{% endif %}
</td>
<td class="text-center">
{% if goal.revenue==0 %}-{% else %}{{ goal.revenue|money(idSite)|raw }}{% endif %}
</td>
{% if userCanEditGoals %}
<td class="text-center">
<button id="{{ goal.idgoal }}" class="edit-goal btn btn-flat btn-lg" title="{{ 'General_Edit'|translate }}">
<span class="icon-edit"></span>
</button>
</td>
<td class="text-center">
<button id="{{ goal.idgoal }}" class="delete-goal btn btn-flat btn-lg" title="{{ 'General_Delete'|translate }}">
<span class="icon-delete"></span>
</button>
</td>
{% endif %}
</tr>
{% endfor %}
{% endif %}
</table>
{% if userCanEditGoals and onlyShowAddNewGoal is not defined %}
<p>
<button id="add-goal" class="btn btn-lg btn-flat">
<span class="icon-add"></span>
{{ 'Goals_AddNewGoal'|translate }}
</button>
</p>
{% endif %}
</div>
<div class="ui-confirm" id="confirm">
@ -50,7 +73,10 @@
"file": "{{ 'Goals_Download'|translate }}",
"url": "{{ 'Goals_VisitUrl'|translate }}",
"title": "{{ 'Goals_VisitPageTitle'|translate }}",
"external_website": "{{ 'Goals_ClickOutlink'|translate }}"
"external_website": "{{ 'Goals_ClickOutlink'|translate }}",
"event_action": "{{ 'Goals_SendEvent'|translate }} ({{ 'Events_EventAction'|translate }})",
"event_category": "{{ 'Goals_SendEvent'|translate }} ({{ 'Events_EventCategory'|translate }})",
"event_name": "{{ 'Goals_SendEvent'|translate }} ({{ 'Events_EventName'|translate }})"
};
$(document).ready(function () {