refs #4987 show footer icon drawer if not in dialog

2 files changed, 18 insertions, 9 deletions

diff --git a/plugins/ZenMode/angularjs/zen-mode/zen-mode-switcher-directive.js b/plugins/ZenMode/angularjs/zen-mode/zen-mode-switcher-directive.js
index 408151e377..ffa8c36e01 100644
--- a/plugins/ZenMode/angularjs/zen-mode/zen-mode-switcher-directive.js
+++ b/plugins/ZenMode/angularjs/zen-mode/zen-mode-switcher-directive.js
@@ -15,7 +15,7 @@ angular.module('piwikApp').directive('piwikZenModeSwitcher', function($rootEleme
     function showZenModeIsActivatedNotification() {
         var UI = require('piwik/UI');
         var notification = new UI.Notification();
-        var message = '<ul><li>To search for menu items, reports or websites use the search box on the top right or press alt+s.</li><li>To show the footer icons in the tables press alt+f.</li><li>To leave the ZenMode press the arrow on the top right or press alt+z</li></ul>';
+        var message = '<ul><li>To search for menu items, reports or websites use the search box on the top right or press alt+s.</li><li>To leave the ZenMode press the arrow on the top right or press alt+z</li></ul>';
         notification.show(message, {
             title: 'ZenMode activated',
             context: 'info',
diff --git a/plugins/ZenMode/angularjs/zen-mode/zen-mode.less b/plugins/ZenMode/angularjs/zen-mode/zen-mode.less
index c7786776b8..60b1762168 100644
--- a/plugins/ZenMode/angularjs/zen-mode/zen-mode.less
+++ b/plugins/ZenMode/angularjs/zen-mode/zen-mode.less
@@ -146,8 +146,23 @@
     border-top: 0px;
   }
 
-  #content:not(#dashboardWidgetsArea) .dataTableFooterIcons {
-    display: none;
+  #content .foldDataTableFooterDrawer,
+  #content .dataTableFeatures .expandDataTableFooterDrawer {
+    opacity: 0;
+    -webkit-transition: all 300ms ease;
+    -moz-transition: all 300ms ease;
+    -ms-transition: all 300ms ease;
+    -o-transition: all 300ms ease;
+    transition: all 300ms ease;
+  }
+
+  #content > div:not(#dashboard) .dataTableFeatures .expandDataTableFooterDrawer {
+    margin-bottom: -20px;
+  }
+
+  #content .dataTableFeatures:hover .foldDataTableFooterDrawer,
+  #content .dataTableFeatures:hover .expandDataTableFooterDrawer {
+    opacity: 1 !important;
   }
 
   #content h2:nth-of-type(n+2) {
@@ -179,10 +194,4 @@
     margin-left: 13px;
   }
 
-  table.dataTable tr:hover td.labeleven,
-  table.dataTable tr:hover td.columneven,
-  table.dataTable tr:hover td.labelodd,
-  table.dataTable tr:hover td.columnodd {
-    background-color: @silver-95 !important;
-  }
 }