No longer show "this is demo.piwik.org" message in top control (#12111)

* no longer show "this is demo.piwik.org" message in top control

* update key

1 files changed, 3 insertions, 21 deletions

diff --git a/plugins/CoreHome/templates/_headerMessage.twig b/plugins/CoreHome/templates/_headerMessage.twig
index ee3b5af8f8..91858adf66 100644
--- a/plugins/CoreHome/templates/_headerMessage.twig
+++ b/plugins/CoreHome/templates/_headerMessage.twig
@@ -10,17 +10,13 @@
     </span>
 {% endset %}
 
-{% if isPiwikDemo or (latest_version_available and hasSomeViewAccess and not isUserIsAnonymous) or (isSuperUser and isAdminArea is defined and isAdminArea) %}
+{% if (latest_version_available and hasSomeViewAccess and not isUserIsAnonymous) or (isSuperUser and isAdminArea is defined and isAdminArea) %}
 <div piwik-expand-on-hover
      id="header_message"
-     class="piwikSelector borderedControl {% if isPiwikDemo or not latest_version_available %}header_info{% else %}{% endif %} {% if isPiwikDemo %}isPiwikDemo{% else %}piwikTopControl{% endif %} {% if latest_version_available %}update_available{% endif %}"
+     class="piwikSelector borderedControl {% if not latest_version_available %}header_info{% else %}{% endif %} piwikTopControl {% if latest_version_available %}update_available{% endif %}"
         >
 
-        {% if isPiwikDemo %}
-        <a class="title" style="cursor:default;">
-            {{ 'General_YouAreViewingDemoShortMessage'|translate }}
-          </a>
-        {% elseif latest_version_available %}
+        {% if latest_version_available and not isPiwikDemo %}
         <a class="title" href="?module=CoreUpdater&action=newVersionAvailable" style="cursor:pointer;">
             {{ 'General_NewUpdatePiwikX'|translate(latest_version_available) }}
             <span class="icon-warning"></span>
@@ -32,13 +28,6 @@
         {% endif %}
 
     <div class="dropdown positionInViewport">
-        {% if isPiwikDemo %}
-            {{ 'General_DownloadFullVersion'|translate("<a rel='noreferrer' href='https://piwik.org/'>","</a>","<a rel='noreferrer' href='https://piwik.org'>piwik.org</a>")|raw }}
-            <br/>
-            {% if isSuperUser and isAdminArea is defined and isAdminArea %}
-                <br/>
-            {% endif %}
-        {% endif %}
         {% if latest_version_available and isSuperUser %}
             {% if isMultiServerEnvironment %}
                 {{ 'CoreHome_OneClickUpdateNotPossibleAsMultiServerEnvironment'|translate("<a rel='noreferrer' href='https://builds.piwik.org/piwik-" ~ latest_version_available ~ ".zip'>","</a>")|raw }}
@@ -52,13 +41,6 @@
             <br />
         {% endif %}
 
-        {% if isPiwikDemo and isSuperUser and isAdminArea is defined and isAdminArea %}
-            <br/>
-            {{ updateCheck|raw }}
-            <br/>
-            <br/>
-        {% endif %}
-
         {{ 'General_YouAreCurrentlyUsing'|translate(piwik_version) }}
     </div>
 </div>