Merge pull request #269 from piwik/4987_zenmode

refs #4987 Simplify Piwik interface: Zen Mode

2 files changed, 11 insertions, 11 deletions

diff --git a/plugins/Annotations/javascripts/annotations.js b/plugins/Annotations/javascripts/annotations.js
index 9512ac28d6..4aac660f59 100755
--- a/plugins/Annotations/javascripts/annotations.js
+++ b/plugins/Annotations/javascripts/annotations.js
@@ -520,11 +520,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'});
 
@@ -546,11 +542,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
index 2810ce0bf5..e0bfd541b6 100755
--- 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;
@@ -26,6 +26,14 @@
   }
 }
 
+.ui-dialog .evolution-annotations > span {
+  top: 25px;
+}
+
+body > .widget .evolution-annotations > span {
+  top: -25px;
+}
+
 .annotation-manager {
     text-align: left;
     margin-top: -18px;