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

24
www/analytics/plugins/Annotations/javascripts/annotations.js
View file

@ -1,5 +1,5 @@
/*!
* Piwik - Web Analytics
* Piwik - free/libre analytics platform
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@ -126,6 +126,8 @@
annotationDate = new Date(parts[0], parts[1] - 1, parts[2]);
var result = piwik.getBaseDatePickerOptions(annotationDate);
result.showButtonPanel = true;
result.currentText = _pk_translate('Intl_Today');
// make sure days before site start & after today cannot be selected
var piwikMinDate = result.minDate;
@ -160,6 +162,7 @@
*/
var toggleAnnotationMode = function (inAnnotationElement) {
var annotation = $(inAnnotationElement).closest('.annotation');
annotation.toggleClass('edit')
$('.annotation-period,.annotation-period-edit,.delete-annotation,' +
'.annotation-edit-mode,.annotation-view-mode', annotation).toggle();
@ -243,7 +246,8 @@
manager.on('click', '.add-annotation', function (e) {
e.preventDefault();
$('.new-annotation-row', manager).show();
var $newRow = $('.new-annotation-row', manager);
$newRow.show();
$(this).hide();
return false;
@ -459,9 +463,9 @@
// modify the starred count & make sure the correct image is used
var newStarCount = starredCount + starAmt;
if (newStarCount > 0) {
var newImg = 'plugins/Zeitgeist/images/annotations_starred.png';
var newImg = 'plugins/Morpheus/images/annotations_starred.png';
} else {
var newImg = 'plugins/Zeitgeist/images/annotations.png';
var newImg = 'plugins/Morpheus/images/annotations.png';
}
$(this).attr('data-starred', newStarCount).find('img').attr('src', newImg);
@ -519,11 +523,7 @@
loadingAnnotationManager = true;
var isDashboard = !!$('#dashboardWidgetsArea').length;
if (isDashboard) {
$('.loadingPiwikBelow', domElem).insertAfter($('.evolution-annotations', domElem));
}
$('.loadingPiwikBelow', domElem).insertAfter($('.evolution-annotations', domElem));
var loading = $('.loadingPiwikBelow', domElem).css({display: 'block'});
@ -545,11 +545,7 @@
loading.css('visibility', 'hidden');
// add & show annotation manager
if (isDashboard) {
manager.insertAfter($('.evolution-annotations', domElem));
} else {
$('.dataTableFeatures', domElem).append(manager);
}
manager.insertAfter($('.evolution-annotations', domElem));
manager.slideDown('slow', function () {
loading.hide().css('visibility', 'visible');