diff --git a/plugins/Annotations/Controller.php b/plugins/Annotations/Controller.php index 616da88ec18807fd58131cfb61238ccae8cc4dba..9ea46d568010cb922f0ceddba21a57bb7dcbc562 100755 --- a/plugins/Annotations/Controller.php +++ b/plugins/Annotations/Controller.php @@ -10,6 +10,7 @@ namespace Piwik\Plugins\Annotations; use Piwik\API\Request; use Piwik\Common; +use Piwik\Date; use Piwik\Piwik; use Piwik\View; @@ -70,6 +71,7 @@ class Controller extends \Piwik\Plugin\Controller list($startDate, $endDate) = API::getDateRangeForPeriod($date, $period, $lastN); $view->startDate = $startDate->toString(); $view->endDate = $endDate->toString(); + $view->today = Date::today()->toString(); $dateFormat = Piwik::translate('CoreHome_ShortDateFormatWithYear'); $view->startDatePretty = $startDate->getLocalized($dateFormat); diff --git a/plugins/Annotations/templates/_annotationList.twig b/plugins/Annotations/templates/_annotationList.twig index 79f7f31c22b250b8fc98de1f3ac09b46fc59e783..811f6c41a9052157c7520b03cf396a1884ff794f 100755 --- a/plugins/Annotations/templates/_annotationList.twig +++ b/plugins/Annotations/templates/_annotationList.twig @@ -8,11 +8,11 @@ {% for annotation in annotations %} {% include "@Annotations/_annotation.twig" %} {% endfor %} - <tr class="new-annotation-row" style="display:none;" data-date="{{ startDate }}"> + <tr class="new-annotation-row" style="display:none;" data-date="{{ today }}"> <td class="annotation-meta"> <div class="annotation-star"> </div> <div class="annotation-period-edit"> - <a href="#">{{ startDate }}</a> + <a href="#">{{ today }}</a> <div class="datepicker" style="display:none;"/> </div>