Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@googlemail.com>2014-09-23 13:09:43 +0400
committerThomas Steur <thomas.steur@googlemail.com>2014-09-23 13:09:43 +0400
commit73f3e0e3a4fd1375d7d154b35b0c422a01774633 (patch)
tree75ca2c51f0a6fb1abc405517afb04628e6914cb9 /plugins/Annotations
parent145cbc825864cc9ca625c6d1740f53fff5ec123e (diff)
refs #5972 display today button in calendar. Unfortunately it does not select the date directly and it is not possible to add another button for yesterday which are both quite annoying. When moving to Angular we better choose another calendar
Diffstat (limited to 'plugins/Annotations')
-rwxr-xr-xplugins/Annotations/javascripts/annotations.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/Annotations/javascripts/annotations.js b/plugins/Annotations/javascripts/annotations.js
index d36e9128f7..4f8d21de6a 100755
--- a/plugins/Annotations/javascripts/annotations.js
+++ b/plugins/Annotations/javascripts/annotations.js
@@ -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('General_Today');
// make sure days before site start & after today cannot be selected
var piwikMinDate = result.minDate;
@@ -244,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;