diff options
author | Thomas Steur <thomas.steur@googlemail.com> | 2014-05-01 05:23:22 +0400 |
---|---|---|
committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-05-01 05:23:22 +0400 |
commit | 6cd5d7c8d21d972f606d5f8e1cd1e7f87593d565 (patch) | |
tree | e8e8ca88aa3381fc71bd98057bc12a0a1540a1b0 /plugins/Annotations | |
parent | bf1a786c26a3e91ce105b2755e48d39d0da188d4 (diff) |
refs #4987 show footer icon drawer if not in dialog
Diffstat (limited to 'plugins/Annotations')
-rwxr-xr-x | plugins/Annotations/javascripts/annotations.js | 12 | ||||
-rwxr-xr-x | plugins/Annotations/stylesheets/annotations.less | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/plugins/Annotations/javascripts/annotations.js b/plugins/Annotations/javascripts/annotations.js index 8ab218ef22..f87af6e00d 100755 --- 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 index c848328dab..95957dc25b 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; |