refs #4987 some bugfixes especially for small windows, fixed a test, enabled plugin

8 files changed, 30 insertions, 5 deletions

diff --git a/LEGALNOTICE b/LEGALNOTICE
index e95df84651..abe18ccaad 100644
--- a/LEGALNOTICE
+++ b/LEGALNOTICE
@@ -216,6 +216,14 @@ THIRD-PARTY COMPONENTS AND LIBRARIES
 	Link: https://github.com/symfony/Console
 	License: MIT
 
+	Name: AngularJS
+	Link: https://github.com/angular/angular.js
+	License: MIT
+
+	Name: Mousetrap
+	Link: https://github.com/ccampbell/mousetrap
+	License: Apache 2.0
+
 
 THIRD-PARTY CONTENT
 
diff --git a/config/global.ini.php b/config/global.ini.php
index 939ce65c17..c9598fafeb 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -610,6 +610,7 @@ Plugins[] = SegmentEditor
 Plugins[] = Insights
 
 Plugins[] = Morpheus
+Plugins[] = ZenMode
 
 [PluginsInstalled]
 PluginsInstalled[] = Login
diff --git a/plugins/ZenMode/javascripts/mousetrap.min.js b/libs/mousetrap/mousetrap.min.js
index 58a8e1bb72..58a8e1bb72 100644
--- a/plugins/ZenMode/javascripts/mousetrap.min.js
+++ b/libs/mousetrap/mousetrap.min.js
diff --git a/plugins/Morpheus/stylesheets/theme.less b/plugins/Morpheus/stylesheets/theme.less
index 5436a039d3..9bad58c378 100644
--- a/plugins/Morpheus/stylesheets/theme.less
+++ b/plugins/Morpheus/stylesheets/theme.less
@@ -389,7 +389,7 @@ table.dataTable {
                 padding-bottom: 12px;
                 border-bottom: 1px solid @silver-85;
                 &.columnSorted {
-                    background:  @silver-95 !important;
+                    background:  @theme-color-background-base !important;
                     .sortIcon {
                         margin-top: -1px;
                     }
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.less b/plugins/MultiSites/angularjs/dashboard/dashboard.less
index 0638e1315a..4434bb5389 100644
--- a/plugins/MultiSites/angularjs/dashboard/dashboard.less
+++ b/plugins/MultiSites/angularjs/dashboard/dashboard.less
@@ -60,8 +60,14 @@
     height: 10px;
   }
 
+  th:first-child {
+    text-align:left;
+  }
+
   th {
     cursor: pointer;
+    border-left: 0px;
+    text-align: center;
   }
 
   .site_search input {
diff --git a/plugins/ZenMode/ZenMode.php b/plugins/ZenMode/ZenMode.php
index b7ad5d6370..711bdf3cab 100644
--- a/plugins/ZenMode/ZenMode.php
+++ b/plugins/ZenMode/ZenMode.php
@@ -35,7 +35,6 @@ class ZenMode extends \Piwik\Plugin
 
     public function getJsFiles(&$jsFiles)
     {
-        $jsFiles[] = "plugins/ZenMode/javascripts/mousetrap.min.js";
         $jsFiles[] = "plugins/ZenMode/javascripts/zen-mode.js";
         $jsFiles[] = "plugins/ZenMode/angularjs/quick-access/quick-access-directive.js";
         $jsFiles[] = "plugins/ZenMode/angularjs/zen-mode/zen-mode-switcher-directive.js";
diff --git a/plugins/ZenMode/angularjs/quick-access/quick-access.less b/plugins/ZenMode/angularjs/quick-access/quick-access.less
index c34793d0ec..52d29dafa9 100644
--- a/plugins/ZenMode/angularjs/quick-access/quick-access.less
+++ b/plugins/ZenMode/angularjs/quick-access/quick-access.less
@@ -14,4 +14,7 @@
   .quick-access-category:hover {
     background: none !important;
   }
+  .no-result {
+    padding-left: 27px;
+  }
 }
\ No newline at end of file
diff --git a/plugins/ZenMode/javascripts/zen-mode.js b/plugins/ZenMode/javascripts/zen-mode.js
index 5f4f279451..7995cbcd8a 100644
--- a/plugins/ZenMode/javascripts/zen-mode.js
+++ b/plugins/ZenMode/javascripts/zen-mode.js
@@ -98,18 +98,26 @@ $(document).ready(function () {
 
         $('#Searchmenu').off('keydown focus', '.quick-access input', showQuickAccessMenu);
         $('#Searchmenu').off('blur', '.quick-access input', hideQuickAccessMenu);
+        menu.prototype.adaptSubMenuHeight();
     }
 
     function overMainLI () {
         var $this = $(this);
         var position = $this.position();
         var width = $this.width();
-
-        $this.find('ul').css({left: position.left + 'px', display: 'block', minWidth: width+'px'});
+        var height = $this.height();
+
+        $this.find('ul').css({
+            left: position.left + 'px',
+            display: 'block',
+            minWidth: width + 'px',
+            position: 'absolute',
+            top: (position.top + height) + 'px'
+        });
     }
 
     function outMainLI () {
-        $(this).find('ul').css({left: '', display: '', minWidth: ''});
+        $(this).find('ul').css({left: '', display: '', minWidth: '', position: '', top: ''});
     }
 
     function resetSubmenu()