diff options
author | Zoltan Flamis <zoltan@innocraft.com> | 2021-04-22 00:23:22 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-22 00:23:22 +0300 |
commit | b66635e4e16f5af26171211b6196f1dff319e1c5 (patch) | |
tree | afc05cc74c7b62f85aeec8e79159798f710f2537 /plugins/CoreHome/javascripts | |
parent | 647ed543aecd9b1d92ecfb95acd5f9ac1c7d58f7 (diff) |
show period label on evo graph (#17456)
* v1
* v2
* use css classes
* update period name when selected
* fix ui tests
* use translation for period name
Co-authored-by: sgiehl <stefan@matomo.org>
Diffstat (limited to 'plugins/CoreHome/javascripts')
-rw-r--r-- | plugins/CoreHome/javascripts/dataTable.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index dca051d25b..76d85feb76 100644 --- a/plugins/CoreHome/javascripts/dataTable.js +++ b/plugins/CoreHome/javascripts/dataTable.js @@ -237,7 +237,7 @@ $.extend(DataTable.prototype, UIControl.prototype, { delete self.param.filter_offset; delete self.param.filter_limit; } - + delete self.param.showtitle; var container = $('#' + self.workingDivId + ' .piwik-graph'); @@ -725,6 +725,9 @@ $.extend(DataTable.prototype, UIControl.prototype, { var endDateOfPeriod = currentPeriod.getDateRange()[1]; endDateOfPeriod = piwikPeriods.format(endDateOfPeriod); + var newPeriod = piwikPeriods.get(period); + $('.periodName', domElem).html(newPeriod.getDisplayText()); + self.param['period'] = period; self.param['date'] = endDateOfPeriod; self.reloadAjaxDataTable(); @@ -836,7 +839,7 @@ $.extend(DataTable.prototype, UIControl.prototype, { $searchAction.find('.icon-search').off('click', searchForPattern); $searchInput.val(''); - + if (currentPattern) { // we search for this pattern so if there was a search term before, and someone closes the search // we show all results again @@ -1595,7 +1598,7 @@ $.extend(DataTable.prototype, UIControl.prototype, { $('th:has(.columnDocumentation)', domElem).each(function () { var th = $(this); var tooltip = th.find('.columnDocumentation'); - + tooltip.next().hover(function () { var left = (-1 * tooltip.outerWidth() / 2) + th.width() / 2; var top = -1 * tooltip.outerHeight(); |