revert refresh button (#19522)

* revert refresh bottom

revert refresh bottom

* update screenshots

* Update Transitions_transitions_popup_urls.png

update ui

* add refresh short cut

add refresh short cut

* Update plugins/CoreHome/javascripts/top_controls.js

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* update screenshots and add translation

update screenshots and add translation

* Update plugins/CoreHome/CoreHome.php

Co-authored-by: Stefan Giehl <stefan@matomo.org>

* Revert "Update Transitions_transitions_popup_urls.png"

This reverts commit b1420422717ef761180318bea91eab39d3aa4b86.

* Update UIIntegrationTest_shortcuts.png

update shortcut screenshot and revert Transition screenshots

Co-authored-by: Stefan Giehl <stefan@matomo.org>

7 files changed, 29 insertions, 67 deletions

diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
index 97ce12201e..6829313531 100644
--- a/plugins/CoreHome/CoreHome.php
+++ b/plugins/CoreHome/CoreHome.php
@@ -192,7 +192,6 @@ class CoreHome extends \Piwik\Plugin
         $jsFiles[] = "plugins/CoreHome/javascripts/numberFormatter.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/zen-mode.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/noreferrer.js";
-        $jsFiles[] = "plugins/CoreHome/javascripts/refresh-button.js";
 
         $jsFiles[] = "plugins/CoreHome/angularjs/piwikApp.config.js";
 
@@ -380,6 +379,7 @@ class CoreHome extends \Piwik\Plugin
         $translationKeys[] = 'CoreHome_ShortcutCalendar';
         $translationKeys[] = 'CoreHome_ShortcutSearch';
         $translationKeys[] = 'CoreHome_ShortcutHelp';
+        $translationKeys[] = 'CoreHome_ShortcutRefresh';
         $translationKeys[] = 'CoreHome_StandardReport';
         $translationKeys[] = 'CoreHome_ReportWithMetadata';
         $translationKeys[] = 'CoreHome_ReportType';
@@ -411,6 +411,5 @@ class CoreHome extends \Piwik\Plugin
         $translationKeys[] = 'CoreHome_StartDate';
         $translationKeys[] = 'CoreHome_EndDate';
         $translationKeys[] = 'CoreHome_DataForThisReportHasBeenDisabled';
-        $translationKeys[] = 'CoreHome_ShortcutRefresh';
     }
 }
diff --git a/plugins/CoreHome/javascripts/refresh-button.js b/plugins/CoreHome/javascripts/refresh-button.js
deleted file mode 100644
index de364d2a3e..0000000000
--- a/plugins/CoreHome/javascripts/refresh-button.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*!
- * Matomo - free/libre analytics platform
- *
- * @link http://matomo.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
- */
-$(function () {
-  var iconRefresh = $('.top_controls .icon-reload');
-
-  function refresh() {
-    var Matomo = window.CoreHome.Matomo;
-    var hashParsed = window.CoreHome.MatomoUrl.hashParsed.value;
-
-    Matomo.postEvent('loadPage', hashParsed.category, hashParsed.subcategory);
-  }
-
-  function isCoreHomeModuleActive() {
-    var search = window.CoreHome.MatomoUrl.parse(window.location.search.slice(1));
-    return search.module === 'CoreHome';
-  }
-
-  if (isCoreHomeModuleActive()) {
-    iconRefresh.removeClass('hidden');
-
-    iconRefresh.on('click', function (e) {
-      e.preventDefault();
-      refresh();
-    });
-
-    piwikHelper.registerShortcut('r', _pk_translate('CoreHome_ShortcutRefresh'), function (event) {
-      if (event.altKey) {
-        return;
-      }
-      if (event.preventDefault) {
-        event.preventDefault();
-      } else {
-        event.returnValue = false; // IE
-      }
-
-      refresh();
-    });
-  }
-});
diff --git a/plugins/CoreHome/javascripts/top_controls.js b/plugins/CoreHome/javascripts/top_controls.js
index f4a793b4b5..66dee03260 100644
--- a/plugins/CoreHome/javascripts/top_controls.js
+++ b/plugins/CoreHome/javascripts/top_controls.js
@@ -108,3 +108,22 @@ function blockPropegation(){
         e.stopPropagation();
     })
 }
+
+//refresh page short cut 'r'
+$(function () {
+  piwikHelper.registerShortcut('r', _pk_translate('CoreHome_ShortcutRefresh'), function (event) {
+    if (event.altKey) {
+      return;
+    }
+    if (event.preventDefault) {
+      event.preventDefault();
+    } else {
+      event.returnValue = false; // IE
+    }
+
+    var Matomo = window.CoreHome.Matomo;
+    var hashParsed = window.CoreHome.MatomoUrl.hashParsed.value;
+
+    Matomo.postEvent('loadPage', hashParsed.category, hashParsed.subcategory);
+  });
+});
\ No newline at end of file
diff --git a/plugins/CoreHome/lang/de.json b/plugins/CoreHome/lang/de.json
index 07107b6006..bbffdaa0a8 100644
--- a/plugins/CoreHome/lang/de.json
+++ b/plugins/CoreHome/lang/de.json
@@ -90,7 +90,6 @@
         "ShortcutCalendar": "um den Kalender zu öffnen (d steht für Datum)",
         "ShortcutHelp": "um diese Hilfe anzuzeigen",
         "ShortcutSearch": "um diese Suche zu öffnen (f steht für Find)",
-        "ShortcutRefresh": "um die aktuelle Ansicht zu aktualisieren",
         "ShortcutSegmentSelector": "um den Segment Selektor zu öffnen",
         "ShortcutWebsiteSelector": "um den Webseiten Selektor zu öffnen",
         "ShortcutZenMode": "für Zen Modus",
@@ -128,7 +127,6 @@
         "VisitorsOverviewHelp": "Die Besucherübersicht hilft Ihnen, die Popularität Ihrer Website zu verstehen. Dazu stellt sie Diagramme bereit, die zeigen, wie viele Besuche Ihre Website über einen ausgewählten Zeitraum erhält und wie hoch das durchschnittliche Engagement für wichtige Funktionen wie Suchen und Downloads ist.",
         "WebAnalyticsReports": "Webanalytik-Berichte",
         "YouAreUsingTheLatestVersion": "Sie verwenden die aktuelle Version von Matomo!",
-        "YourDonationWillHelp": "Ihre Spende wird direkt dafür eingesetzt, neue Features und Erweiterungen für diese Open-Source Analyse-Plattform zu finanzieren. Das bedeutet, die Community wird immer von einem Tool profitieren, welches Privatsphäre beschützt und Ihnen erlaubt, die Kontrolle Ihrer Daten zu bewahren.",
-        "Refresh": "Aktualisieren"
+        "YourDonationWillHelp": "Ihre Spende wird direkt dafür eingesetzt, neue Features und Erweiterungen für diese Open-Source Analyse-Plattform zu finanzieren. Das bedeutet, die Community wird immer von einem Tool profitieren, welches Privatsphäre beschützt und Ihnen erlaubt, die Kontrolle Ihrer Daten zu bewahren."
     }
 }
diff --git a/plugins/CoreHome/lang/en.json b/plugins/CoreHome/lang/en.json
index 843fc1510b..805be8faca 100644
--- a/plugins/CoreHome/lang/en.json
+++ b/plugins/CoreHome/lang/en.json
@@ -63,7 +63,7 @@
         "ShortcutWebsiteSelector": "to open Website selector",
         "ShortcutCalendar": "to open calendar (d stands for Date)",
         "ShortcutSearch": "to open the search (f stands for Find)",
-        "ShortcutRefresh": "to refresh the current view",
+        "ShortcutRefresh": "to refresh the content",
         "ShortcutHelp": "to show this help",
         "ShowJSCode": "Show the JavaScript code to insert",
         "SkipToContent": "Skip to content",
@@ -128,7 +128,6 @@
         "EngagementSubcategoryHelp2": "This can help you to optimise for frequency and high-interaction visits in addition to maximising your reach.",
         "PeriodHasOnlyRawData": "It looks like reports for this period have not been processed yet. Do you want to see what's happening now? Check out the %1$sVisits log%2$s or choose a different date period until the reports are generated.",
         "StartDate": "Start Date",
-        "EndDate": "End Date",
-        "Refresh": "Refresh"
+        "EndDate": "End Date"
     }
 }
diff --git a/plugins/CoreHome/stylesheets/layout.less b/plugins/CoreHome/stylesheets/layout.less
index 6c5ffb517e..07da8e2668 100644
--- a/plugins/CoreHome/stylesheets/layout.less
+++ b/plugins/CoreHome/stylesheets/layout.less
@@ -122,9 +122,9 @@ nav {
     margin-left: 224px;
   }
 
-  &>.top_controls {
-    &> .icon-arrowup:before, &> .icon-arrowdown:before, &> .icon-reload:before {
-      padding: 17px 0 0 0;
+    &>.top_controls {
+      .icon-arrowup:before, .icon-arrowdown:before {
+      padding: 17px 0 0 0px;
       display: inline-block;
       cursor: pointer;
 
@@ -132,11 +132,6 @@ nav {
         display: none;
       }
     }
-
-    &> .icon-reload:before {
-      padding-right: 10px;
-      font-weight: lighter;
-    }
   }
 
   @media only screen and (min-width: 993px) {
diff --git a/plugins/CoreHome/templates/_headerMessage.twig b/plugins/CoreHome/templates/_headerMessage.twig
index efa5a9de5d..8fb6ec2e9e 100644
--- a/plugins/CoreHome/templates/_headerMessage.twig
+++ b/plugins/CoreHome/templates/_headerMessage.twig
@@ -10,9 +10,7 @@
     </span>
 {% endset %}
 
-{% set showVersionInfo = (latest_version_available and not isPiwikDemo and hasSomeViewAccess and not isUserIsAnonymous and showUpdateNotificationToUser) or (isSuperUser and isAdminArea is defined and isAdminArea) %}
-
-{% if showVersionInfo %}
+{% if (latest_version_available and not isPiwikDemo and hasSomeViewAccess and not isUserIsAnonymous and showUpdateNotificationToUser) or (isSuperUser and isAdminArea is defined and isAdminArea) %}
 <div piwik-expand-on-hover
      id="header_message"
      class="piwikSelector borderedControl {% if not latest_version_available %}header_info{% else %}{% endif %} piwikTopControl {% if latest_version_available %}update_available{% endif %}"
@@ -60,11 +58,8 @@
     </div>
 </div>
 
-{% endif %}
-
-<span class="icon icon-reload hidden" title="{{ 'CoreHome_Refresh'|translate }}"></span>
 <span class="icon icon-arrowup"></span>
-
-{% if showVersionInfo %}
 <div style="clear:right"></div>
+{% else %}
+<span class="icon icon-arrowup"></span>
 {% endif %}