Piwik is now Matomo (#12410)

* Piwik is now Matomo

* make sure logo is not shown too high

* fix some tests

* fix logo height

* fix some ui tests

* update ui tests

24 files changed, 21 insertions, 41 deletions

diff --git a/plugins/CoreConsole/Commands/DevelopmentSyncProcessedSystemTests.php b/plugins/CoreConsole/Commands/DevelopmentSyncProcessedSystemTests.php
index 6879298f23..2e7698235b 100644
--- a/plugins/CoreConsole/Commands/DevelopmentSyncProcessedSystemTests.php
+++ b/plugins/CoreConsole/Commands/DevelopmentSyncProcessedSystemTests.php
@@ -50,7 +50,7 @@ class DevelopmentSyncProcessedSystemTests extends ConsoleCommand
         }
 
         $filename = sprintf('system.%s.tar.bz2', $buildNumber);
-        $urlBase  = sprintf('https://builds-artifacts.piwik.org/piwik/piwik/%s', $filename);
+        $urlBase  = sprintf('https://builds-artifacts.piwik.org/matomo-org/piwik/%s', $filename);
         $tests    = Http::sendHttpRequest($urlBase, $timeout = 120);
 
         $tarFile = $tmpDir . $filename;
diff --git a/plugins/CoreHome/images/applePinnedTab.svg b/plugins/CoreHome/images/applePinnedTab.svg
index 8e024a6e6b..16bd0fca2e 100644
--- a/plugins/CoreHome/images/applePinnedTab.svg
+++ b/plugins/CoreHome/images/applePinnedTab.svg
@@ -1,11 +1,5 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
  "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" version="1.0" viewBox="0 0 16 16">
-
-<g transform="translate(0 500) scale(0.1 -0.1)" fill="#000000" stroke="none">
-
-<path d="M 32.8941 4997.94 c -4.32522 -0.632959 -7.8065 -2.46151 -10.7955 -5.59114 c -1.19559 -1.30108 -2.60217 -3.12963 -3.12963 -4.11424 c -2.14503 -4.00874 -2.03954 0.0703289 -2.03954 -69.0629 c 0 -53.5906 0.0703289 -63.4015 0.527466 -65.019 c 1.72306 -6.54058 7.41969 -12.0262 13.8899 -13.4328 c 2.81315 -0.597795 8.54495 -0.246151 10.9713 0.703288 c 4.53621 1.75822 8.2988 5.20433 10.3383 9.45923 c 1.72306 3.62194 1.89888 5.45048 1.89888 20.747 l 0 14.1361 l 19.6217 0 c 24.0173 0.0351644 27.0414 0.281316 35.2348 2.88348 c 16.5976 5.30983 30.3117 18.8481 35.8677 35.3754 c 2.21536 6.68124 2.60217 9.28341 2.60217 18.0042 c 0 7.45486 -0.0351644 8.15815 -0.984604 12.0966 c -1.23075 5.27466 -2.49667 8.75594 -4.99335 13.6086 c -2.74282 5.34499 -5.66147 9.35374 -10.1625 13.8548 c -9.52956 9.52956 -20.8173 14.7691 -35.0589 16.3163 c -3.90325 0.457138 -60.9048 0.457138 -63.7883 0.0351644 Z m 60.3421 -34.5666 c 6.3296 -1.89888 11.7098 -6.36476 14.3471 -11.8504 c 1.79339 -3.79776 2.32085 -6.08345 2.32085 -10.0219 c -0.0351644 -10.057 -7.24387 -19.1294 -17.1251 -21.4503 c -1.75822 -0.421973 -5.59114 -0.527466 -20.1844 -0.527466 l -18.0393 0 l 0 22.3646 l 0 22.3294 l 18.391 -0.140658 c 15.7537 -0.105493 18.6371 -0.210987 20.2899 -0.703288 Z" transform=""></path>
-</g>
-
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" width="16" height="16" id="svgcontent" viewBox="0 0 16 16">
+    <g  stroke="none" ><path id="path3722" d="M14.33416938868642,2.4000000059604645 L9.877183853652477,2.4000000059604645 L7.974018278684616,10.777183859612942 L6.0708527037167554,2.4000000059604645 L1.5,2.4000000059604645 L1.5,13.623798523520232 L4.4279470384120945,13.623798523520232 L4.4279470384120945,8.906548467882871 C4.4279470384120945,7.930569195705653 4.4279470384120945,6.48286307358861 4.395412244234086,5.344214441461563 C4.5743443903326995,6.48286307358861 4.899673888351916,7.930569195705653 5.159933798015118,8.906548467882871 L6.4124449878847605,13.623798523520232 L9.421724400801658,13.623798523520232 L10.657968193582297,8.906548467882871 C10.918228103245497,7.9143017986166475 11.243557601264715,6.48286307358861 11.438752533512115,5.344214441461563 C11.406217739334107,6.48286307358861 11.406217739334107,7.930569195705653 11.406217739334107,8.906548467882871 L11.406217739334107,13.623798523520232 L14.334164777746201,13.623798523520232 L14.33416938868642,2.4000000059604645 z"></path></g></svg>
\ No newline at end of file
diff --git a/plugins/CoreHome/images/applogo_128.png b/plugins/CoreHome/images/applogo_128.png
index 65414dcc7a..2a7b4b8014 100644
--- a/plugins/CoreHome/images/applogo_128.png
+++ b/plugins/CoreHome/images/applogo_128.png
diff --git a/plugins/CoreHome/images/applogo_144.png b/plugins/CoreHome/images/applogo_144.png
index 9db6030351..da9b558eee 100644
--- a/plugins/CoreHome/images/applogo_144.png
+++ b/plugins/CoreHome/images/applogo_144.png
diff --git a/plugins/CoreHome/images/applogo_192.png b/plugins/CoreHome/images/applogo_192.png
index ad223db3ff..f43f3522f1 100644
--- a/plugins/CoreHome/images/applogo_192.png
+++ b/plugins/CoreHome/images/applogo_192.png
diff --git a/plugins/CoreHome/images/applogo_256.png b/plugins/CoreHome/images/applogo_256.png
index 152922a254..838e8693ce 100644
--- a/plugins/CoreHome/images/applogo_256.png
+++ b/plugins/CoreHome/images/applogo_256.png
diff --git a/plugins/CoreHome/images/applogo_32.png b/plugins/CoreHome/images/applogo_32.png
index 174c8ecbf0..e47d348e82 100644
--- a/plugins/CoreHome/images/applogo_32.png
+++ b/plugins/CoreHome/images/applogo_32.png
diff --git a/plugins/CoreHome/images/applogo_72.png b/plugins/CoreHome/images/applogo_72.png
index d9493feed9..58db62d2f3 100644
--- a/plugins/CoreHome/images/applogo_72.png
+++ b/plugins/CoreHome/images/applogo_72.png
diff --git a/plugins/CoreHome/images/applogo_732.png b/plugins/CoreHome/images/applogo_732.png
index 3f40298650..232efc2fa1 100644
--- a/plugins/CoreHome/images/applogo_732.png
+++ b/plugins/CoreHome/images/applogo_732.png
diff --git a/plugins/CoreHome/images/favicon.ico b/plugins/CoreHome/images/favicon.ico
index 616228c5bc..1eb8373a84 100644
--- a/plugins/CoreHome/images/favicon.ico
+++ b/plugins/CoreHome/images/favicon.ico
diff --git a/plugins/CoreHome/images/favicon.png b/plugins/CoreHome/images/favicon.png
index 9bf27d8b92..e47d348e82 100644
--- a/plugins/CoreHome/images/favicon.png
+++ b/plugins/CoreHome/images/favicon.png
diff --git a/plugins/CoreUpdater/templates/layout.twig b/plugins/CoreUpdater/templates/layout.twig
index 4114ff463a..78f28a733e 100644
--- a/plugins/CoreUpdater/templates/layout.twig
+++ b/plugins/CoreUpdater/templates/layout.twig
@@ -21,6 +21,7 @@
 <div class="logo">
     {% if hasSVGLogo %}
         <img src='{{ logoSVG }}' tabindex="3"
+             style="height: 40px;"
              alt="{% if isCustomLogo %}{{ 'General_PoweredBy'|translate }} {% endif %}Piwik"
              class="{% if not isCustomLogo %}default-piwik-logo{% endif %}" />
     {% else %}
diff --git a/plugins/ExamplePlugin/tests/UI/expected-screenshots/SimpleUITest_simplePage.png b/plugins/ExamplePlugin/tests/UI/expected-screenshots/SimpleUITest_simplePage.png
index 9e126574ca..02a1633d3f 100644
--- a/plugins/ExamplePlugin/tests/UI/expected-screenshots/SimpleUITest_simplePage.png
+++ b/plugins/ExamplePlugin/tests/UI/expected-screenshots/SimpleUITest_simplePage.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0c09f176ba2723023b625fce1069af515351deb214adada24c1a04e996c79e36
-size 20041
+oid sha256:a1ca40c9fe6e07635ede9c1b5861651b98f81a3c3252ea2856677e121b4ff43a
+size 21177
diff --git a/plugins/ExamplePlugin/tests/UI/expected-screenshots/SimpleUITest_simplePagePartial.png b/plugins/ExamplePlugin/tests/UI/expected-screenshots/SimpleUITest_simplePagePartial.png
index 27756c1802..25e7274699 100644
--- a/plugins/ExamplePlugin/tests/UI/expected-screenshots/SimpleUITest_simplePagePartial.png
+++ b/plugins/ExamplePlugin/tests/UI/expected-screenshots/SimpleUITest_simplePagePartial.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:34dd6152751ce83809bf2bd4425dc07c60b06d2b9c6f9994a4c8d7a71a2d58c7
-size 15531
+oid sha256:d0463a9aa8055f2da3998b2fef7c2545bb365cd93e8bee0105420c3070300b38
+size 16682
diff --git a/plugins/Login/stylesheets/login.less b/plugins/Login/stylesheets/login.less
index 2d9e34f39f..54cf9acdc3 100644
--- a/plugins/Login/stylesheets/login.less
+++ b/plugins/Login/stylesheets/login.less
@@ -6,7 +6,7 @@
         padding-top: 5px;
 
         img.default-piwik-logo {
-            width: 112px;
+            width: 171px;
         }
 
         img {
diff --git a/plugins/Morpheus/images/logo-email.png b/plugins/Morpheus/images/logo-email.png
index 6a717c69cb..bd6aac3b5c 100644
--- a/plugins/Morpheus/images/logo-email.png
+++ b/plugins/Morpheus/images/logo-email.png
diff --git a/plugins/Morpheus/images/logo-header.png b/plugins/Morpheus/images/logo-header.png
index 6a717c69cb..bd6aac3b5c 100644
--- a/plugins/Morpheus/images/logo-header.png
+++ b/plugins/Morpheus/images/logo-header.png
diff --git a/plugins/Morpheus/images/logo-marketplace.png b/plugins/Morpheus/images/logo-marketplace.png
index d28491d73f..242e568ed1 100644
--- a/plugins/Morpheus/images/logo-marketplace.png
+++ b/plugins/Morpheus/images/logo-marketplace.png
diff --git a/plugins/Morpheus/images/logo.png b/plugins/Morpheus/images/logo.png
index 98ff937736..86d1a7a412 100644
--- a/plugins/Morpheus/images/logo.png
+++ b/plugins/Morpheus/images/logo.png
diff --git a/plugins/Morpheus/images/logo.svg b/plugins/Morpheus/images/logo.svg
index 7beb6ee54d..9bcd0531cd 100644
--- a/plugins/Morpheus/images/logo.svg
+++ b/plugins/Morpheus/images/logo.svg
@@ -1,25 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="170.666px" height="45.704px" viewBox="0 0 170.666 45.704" enable-background="new 0 0 170.666 45.704"
-	 xml:space="preserve">
-<path fill="#ffffff" d="M106.995,1.016c-2.57-0.739-5.251,0.751-5.987,3.329l-5.532,19.351L89.943,4.345
-	c-0.592-2.071-2.441-3.417-4.477-3.492c-0.103-0.009-0.203-0.004-0.306-0.007c-0.102,0.003-0.203-0.003-0.306,0.007
-	c-2.036,0.075-3.885,1.421-4.477,3.492l-5.509,19.27l-5.509-19.27c-0.737-2.578-3.418-4.068-5.987-3.329
-	c-2.57,0.739-4.056,3.428-3.319,6.005l10.075,35.24c0.583,2.038,2.384,3.376,4.382,3.49c0.121,0.011,0.239,0.006,0.359,0.008
-	c0.12-0.002,0.238,0.004,0.359-0.008c1.998-0.114,3.799-1.451,4.382-3.49l5.551-19.416l5.551,19.416
-	c0.588,2.056,2.416,3.398,4.434,3.491c0.111,0.01,0.219,0.005,0.33,0.007c0.11-0.003,0.219,0.003,0.33-0.007
-	c2.019-0.093,3.846-1.435,4.434-3.491l10.075-35.24C111.05,4.444,109.564,1.756,106.995,1.016z"/>
-<path fill="#ffffff" d="M116.502,40.44c0,2.972,2.35,5.322,5.322,5.322c2.972,0,5.322-2.35,5.322-5.322V6.147
-	c0-2.972-2.35-5.322-5.322-5.322c-2.972,0-5.322,2.35-5.322,5.322V40.44z"/>
-<path fill="#ffffff" d="M43.334,40.457c0,2.972,2.35,5.322,5.322,5.322c2.972,0,5.322-2.35,5.322-5.322V6.164
-	c0-2.972-2.35-5.322-5.322-5.322c-2.972,0-5.322,2.35-5.322,5.322V40.457z"/>
-<path fill="#ffffff" d="M155.406,23.156l13.779-13.779c1.974-1.974,1.974-5.097,0-7.071c-1.974-1.974-5.097-1.974-7.071,0
-	l-16.448,16.448V6.147c0-2.972-2.35-5.322-5.322-5.322c-2.972,0-5.322,2.35-5.322,5.322V40.44c0,2.972,2.35,5.322,5.322,5.322
-	c2.972,0,5.322-2.35,5.322-5.322v-7.544l2.669-2.669l13.618,13.857c1.957,1.992,5.079,2.019,7.071,0.062
-	c1.992-1.957,2.019-5.079,0.062-7.071L155.406,23.156z"/>
-<path fill="#ffffff" d="M37.292,16.816c0-8.58-6.787-15.557-15.283-15.9l0.007-0.033H5.322C2.35,0.883,0,3.233,0,6.205v34.177
-	c0,2.972,2.35,5.322,5.322,5.322c2.972,0,5.322-2.35,5.322-5.322v-7.63h11.371l-0.007-0.036
-	C30.505,32.372,37.292,25.396,37.292,16.816z M20.296,23.284l0-0.002h-9.651V10.491h9.464c3.535,0,6.401,2.866,6.401,6.401
-	C26.51,20.364,23.744,23.184,20.296,23.284z"/>
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
+	 width="5836" height="1024" viewBox="0 0 5836 1024"
+	 enable-background="new 0 0 5836 1024" xml:space="preserve" version="1.1" id="Layer_1">
+<path d="M1147.636 960h-398.545l-170.182-749.091-170.182 749.091h-408.727v-1003.636h261.818v421.818c0 87.273 0 216.727-2.909 318.545 16-101.818 45.091-231.273 68.364-318.545l112-421.818h269.091l110.545 421.818c23.273 88.727 52.364 216.727 69.818 318.545-2.909-101.818-2.909-231.273-2.909-318.545v-421.818h261.818zM1761.205-43.636h256c-11.636 85.818-14.545 138.182-14.545 196.364v218.182c0 48-1.455 93.091-4.364 132.364-11.636 141.091-96 250.182-341.818 250.182-196.364 0-357.818-103.273-359.273-285.091l247.273 1.455c4.364 66.909 39.273 106.182 100.364 106.182 56.727 0 88.727-34.909 93.091-74.182 2.909-24.727 2.909-40.727 2.909-56.727v-11.636h-49.455c-263.273 0-420.364-101.818-420.364-267.636 0-149.818 120.727-229.818 248.727-229.818 71.273 0 136.727 17.455 192 52.364l32 81.455zM1627.386 113.455c-52.364 0-88.727 26.182-88.727 72.727 0 77.091 84.364 107.636 202.182 98.909v-50.909c0-81.455-61.091-120.727-113.455-120.727zM2475.227 564.364h171.636v162.909h-171.636v200.727h-261.818v-200.727h-123.636v-162.909h123.636v-324.364c0-43.636 0-80 2.909-125.091 8.727-119.273 66.909-178.909 260.364-178.909 55.273 0 103.273 4.364 154.182 13.091v162.909c-123.636-5.818-148.364 11.636-154.182 90.182-1.455 20.364-1.455 49.455-1.455 75.636zM3108.727 753.455c-254.545 0-417.455-158.545-417.455-408.727 0-248.727 162.909-408.727 417.455-408.727s417.455 160 417.455 408.727c0 250.182-162.909 408.727-417.455 408.727zM3108.727 113.455c-93.091 0-149.818 77.091-149.818 231.273 0 155.636 56.727 231.273 149.818 231.273s149.818-75.636 149.818-231.273c0-154.182-56.727-231.273-149.818-231.273zM4887.773 557.091c-17.454 106.182-104.727 196.364-260.364 196.364-71.273 0-119.273-16-167.273-45.091l-81.455-106.182c-33.455 85.818-116.364 151.273-248.727 151.273-71.273 0-119.273-16-167.273-45.091l-62.545-100.364v125.091h-261.818v-776.727h261.818v410.182c0 132.364 33.455 209.455 117.818 209.455 68.364 0 103.273-43.636 112-117.818 4.363-39.273 5.818-81.455 5.818-106.182v-395.636h261.818v410.182c0 132.364 33.455 209.455 117.818 209.455 68.364 0 103.273-43.636 112-117.818 4.363-39.273 5.818-81.455 5.818-106.182v-395.636h261.818v453.818c0 62.545-1.455 107.636-7.273 146.909zM5418.387 753.455c-254.546 0-417.455-158.545-417.455-408.727 0-248.727 162.909-408.727 417.455-408.727s417.454 160 417.454 408.727c0 250.182-162.909 408.727-417.454 408.727zM5418.387 113.455c-93.091 0-149.819 77.091-149.819 231.273 0 155.636 56.728 231.273 149.819 231.273s149.818-75.636 149.818-231.273c0-154.182-56.728-231.273-149.818-231.273z"
+	  horiz-adv-x="5836" transform="scale(1, -1) translate(0, -960)" fill="#fff"></path>
 </svg>
+
+
diff --git a/plugins/Morpheus/stylesheets/uibase/_header.less b/plugins/Morpheus/stylesheets/uibase/_header.less
index e1d99c3028..b65a3284fe 100644
--- a/plugins/Morpheus/stylesheets/uibase/_header.less
+++ b/plugins/Morpheus/stylesheets/uibase/_header.less
@@ -8,7 +8,7 @@
       max-height: 30px;
 
       &.default-piwik-logo {
-        width: 95px;
+        width: 144px;
       }
     }
 
diff --git a/plugins/Morpheus/templates/layout.twig b/plugins/Morpheus/templates/layout.twig
index 69afb31b46..caa7312195 100644
--- a/plugins/Morpheus/templates/layout.twig
+++ b/plugins/Morpheus/templates/layout.twig
@@ -7,12 +7,12 @@
                 {%- block pageTitle -%}
                     {%- if title is defined %}{{ title }} - {% endif %}
                     {%- if categoryTitle is defined %}{{ categoryTitle }} - {% endif %}
-                    Piwik
+                    Matomo
                 {%- endblock -%}
             </title>
             <meta http-equiv="X-UA-Compatible" content="IE=EDGE,chrome=1"/>
             <meta name="viewport" content="initial-scale=1.0"/>
-            <meta name="generator" content="Piwik - free/libre analytics platform"/>
+            <meta name="generator" content="Matomo - free/libre analytics platform"/>
             <meta name="description" content="{% block pageDescription %}{% endblock %}"/>
             <meta name="apple-itunes-app" content="app-id=737216887" />
             {% block meta %}
diff --git a/plugins/Morpheus/templates/maintenance.tpl b/plugins/Morpheus/templates/maintenance.tpl
index 2895a3cdb8..2a6b281fe3 100644
--- a/plugins/Morpheus/templates/maintenance.tpl
+++ b/plugins/Morpheus/templates/maintenance.tpl
@@ -10,7 +10,7 @@
 <body id="simple">
 
 <div class="logo">
-	<img title="Piwik" alt="Piwik" src="%logoUrl%" />
+	<img title="Piwik" alt="Piwik" style="height: 40px;" src="%logoUrl%" />
 	<br/>
 	<a href='https://piwik.org/'>%piwikTitle%</a>
 </div>
diff --git a/plugins/Morpheus/templates/simpleLayoutHeader.tpl b/plugins/Morpheus/templates/simpleLayoutHeader.tpl
index 28db4dd27e..8244492ad8 100644
--- a/plugins/Morpheus/templates/simpleLayoutHeader.tpl
+++ b/plugins/Morpheus/templates/simpleLayoutHeader.tpl
@@ -10,7 +10,7 @@
 <body id="simple">
 
 <div class="logo">
-	<img title="Piwik" alt="Piwik" src="%logoUrl%"/>
+	<img title="Piwik" alt="Piwik" style="height: 40px;" src="%logoUrl%"/>
 </div>
 
 <div class="box">