refs #4987 show footer icon drawer if not in dialog

matomo-org · May 1, 2014 · 6cd5d7c · 6cd5d7c
1 parent bf1a786
commit 6cd5d7c
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 42 deletions.
diff --git a/plugins/Annotations/javascripts/annotations.js b/plugins/Annotations/javascripts/annotations.js
@@ -519,11 +519,7 @@
 
             loadingAnnotationManager = true;
 
-            var isDashboard = !!$('#dashboardWidgetsArea').length;
-
-            if (isDashboard) {
-                $('.loadingPiwikBelow', domElem).insertAfter($('.evolution-annotations', domElem));
-            }
+            $('.loadingPiwikBelow', domElem).insertAfter($('.evolution-annotations', domElem));
 
             var loading = $('.loadingPiwikBelow', domElem).css({display: 'block'});
 
@@ -545,11 +541,7 @@
                 loading.css('visibility', 'hidden');
 
                 // add & show annotation manager
-                if (isDashboard) {
-                    manager.insertAfter($('.evolution-annotations', domElem));
-                } else {
-                    $('.dataTableFeatures', domElem).append(manager);
-                }
+                manager.insertAfter($('.evolution-annotations', domElem));
 
                 manager.slideDown('slow', function () {
                     loading.hide().css('visibility', 'visible');

diff --git a/plugins/Annotations/stylesheets/annotations.less b/plugins/Annotations/stylesheets/annotations.less
@@ -12,7 +12,7 @@
     top:10px;
 }
 
-#dashboard, .ui-dialog {
+#content, .ui-dialog {
   .evolution-annotations  {
     margin-top: -5px;
     margin-bottom: -5px;

diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js
@@ -706,7 +706,7 @@ $.extend(DataTable.prototype, UIControl.prototype, {
                         ;
 
                     var annotationsCss = {left: 6}; // padding-left of .jqplot-graph element (in _dataTableViz_jqplotGraph.tpl)
-                    if (!self.isDashboard() && !self.isWithinDialog(domElem)) {
+                    if (self.isWithinDialog(domElem)) {
                         annotationsCss['top'] = -datatableFeatures.height() - annotationAxisHeight + noteSize / 2;
                     }
 
@@ -716,11 +716,7 @@ $.extend(DataTable.prototype, UIControl.prototype, {
                     piwik.annotations.placeEvolutionIcons(annotations, domElem);
 
                     // add new section under axis
-                    if (self.isDashboard() || self.isWithinDialog(domElem)) {
-                        annotations.insertAfter($('.datatableRelatedReports', domElem));
-                    } else {
-                        datatableFeatures.append(annotations);
-                    }
+                    annotations.insertAfter($('.datatableRelatedReports', domElem));
 
                     // reposition annotation icons every time the graph is resized
                     $('.piwik-graph', domElem).on('resizeGraph', function () {
@@ -1276,7 +1272,7 @@ $.extend(DataTable.prototype, UIControl.prototype, {
     },
 
     handleExpandFooter: function (domElem) {
-        if (!this.isDashboard() && !this.isWithinDialog(domElem)) {
+        if (this.isWithinDialog(domElem)) {
             return;
         }
 

diff --git a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
@@ -285,7 +285,7 @@ table.dataTable img {
   padding-bottom: 4px;
 }
 
-#dashboard {
+#content {
 
   .dataTableFeatures {
     &.expanded {

diff --git a/plugins/Morpheus/stylesheets/theme.less b/plugins/Morpheus/stylesheets/theme.less
@@ -489,7 +489,7 @@ table.dataTable .dataTableRowActions {
   border-top: 1px solid @silver-80;
 }
 
-#dashboard .dataTableFooterIcons {
+#content .dataTableFooterIcons {
     padding: 6px 8px 0px;
 }
 

diff --git 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
@@ -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;
-  }
 }
diff --git a/plugins/ZenMode/javascripts/zen-mode.js b/plugins/ZenMode/javascripts/zen-mode.js
@@ -60,14 +60,6 @@ $(document).ready(function () {
             updateZenMode();
         }
 
-        Mousetrap.bind('alt+f', function() {
-            if (isDashboardWidgetsArea()) {
-                return;
-            }
-
-            $('.dataTableFooterIcons').toggle();
-        });
-
         Mousetrap.bind('alt+z', function() {
             toggleZenMode();
         });
@@ -83,11 +75,6 @@ $(document).ready(function () {
         });
     }
 
-    function isDashboardWidgetsArea()
-    {
-        return !!$('#dashboardWidgetsArea').length;
-    }
-
     function isDashboard()
     {
         return !!$('.Menu--dashboard').length;