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>

3 files changed, 39 insertions, 22 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();
diff --git a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
index a9ed6b920d..96423295a1 100644
--- a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
+++ b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
@@ -513,7 +513,7 @@ tr.level12 td.label {
 }
 
 table.dataTable td.label img {
-  max-height: 16px; 
+  max-height: 16px;
 }
 
 .pk-emptyDataTable {
@@ -615,6 +615,19 @@ td.cellSubDataTable .loadingPiwik {
     .icon-more-verti {
       font-size: 18px;
     }
+
+    .periodName {
+        padding-left:8px;
+        padding-right:8px;
+        font-size:16px;
+        text-transform:capitalize;
+    }
+  }
+
+  .activatePeriodsSelection {
+    width:auto;
+    text-align:left;
+    padding-left:8px;
   }
 }
 
diff --git a/plugins/CoreHome/templates/_dataTableActions.twig b/plugins/CoreHome/templates/_dataTableActions.twig
index c1f52456b9..39eec1cae5 100644
--- a/plugins/CoreHome/templates/_dataTableActions.twig
+++ b/plugins/CoreHome/templates/_dataTableActions.twig
@@ -33,24 +33,6 @@
             </ul>
         {% endset %}
 
-        {% if properties.show_periods %}
-            <a class="dropdown-button dataTableAction activatePeriodsSelection"
-               href="javascript:;"
-               title="{{ 'CoreHome_ChangePeriod'|translate|e('html_attr') }}"
-               data-target="dropdownPeriods{{ randomIdForDropdown }}">
-                <span class="icon-calendar"></span>
-            </a>
-            <ul id='dropdownPeriods{{ randomIdForDropdown }}' class='dropdown-content dataTablePeriods'>
-                {% for selectablePeriod in properties.selectable_periods %}
-                    <li>
-                        <a data-period="{{ selectablePeriod }}" class="tableIcon {% if (clientSideParameters.period|default('')) == selectablePeriod %}activeIcon{% endif %}">
-                            <span>{{ properties.translations[selectablePeriod]|default(selectablePeriod) }}</span>
-                        </a>
-                    </li>
-                {% endfor %}
-            </ul>
-        {% endif %}
-
         {% if activeFooterIcon and numIcons > 1 %}
             <a class="dropdown-button dataTableAction activateVisualizationSelection"
                href="javascript:;"
@@ -152,4 +134,23 @@
                 </li>
             {% endif %}
         </ul>
+
+        {% if properties.show_periods %}
+            <a class="dropdown-button dataTableAction activatePeriodsSelection"
+               href="javascript:;"
+               title="{{ 'CoreHome_ChangePeriod'|translate|e('html_attr') }}"
+               data-target="dropdownPeriods{{ randomIdForDropdown }}"
+            >
+                <div><span class="icon-calendar"></span><span class="periodName">{{ properties.translations[clientSideParameters.period]|default(clientSideParameters.period) }}</span></div>
+            </a>
+            <ul id='dropdownPeriods{{ randomIdForDropdown }}' class='dropdown-content dataTablePeriods'>
+                {% for selectablePeriod in properties.selectable_periods %}
+                    <li>
+                        <a data-period="{{ selectablePeriod }}" class="tableIcon {% if (clientSideParameters.period|default('')) == selectablePeriod %}activeIcon{% endif %}">
+                            <span>{{ properties.translations[selectablePeriod]|default(selectablePeriod) }}</span>
+                        </a>
+                    </li>
+                {% endfor %}
+            </ul>
+        {% endif %}
     {% endif %}