Correctly size UI dialog accounting for height of menubar

diff --git a/js/Common.js b/js/Common.js
index e2714c33b0ec996c73f36f564639a5caed1b461b..1dee5a526a7798292b3c9968c26ea618d98c299f 100644 (file)
--- a/js/Common.js
+++ b/js/Common.js
@@ -944,6 +944,9 @@ if (!CRM.vars) CRM.vars = {};
             $(this).button('option', 'icons', {primary: 'fa-expand'});
           } else {
             var menuHeight = $('#civicrm-menu').outerHeight();
+            if ($('body').hasClass('crm-menubar-below-cms-menu')) {
+              menuHeight += $('#civicrm-menu').offset().top;
+            }
             $el.data('origSize', {
               position: {my: 'center', at: 'center center+' + (menuHeight / 2), of: window},
               width: $el.dialog('option', 'width'),

diff --git a/js/crm.ajax.js b/js/crm.ajax.js
index 5a1155c8462bd2a24a1e90d91eefc77628be87db..23be078e8b5af74a548cd9f2f87501d07fdeacaf 100644 (file)
--- a/js/crm.ajax.js
+++ b/js/crm.ajax.js
@@ -572,8 +572,11 @@
           var currentHeight = $wrapper.outerHeight(),
             padding = currentHeight - $dialog.height(),
             newHeight = $dialog.prop('scrollHeight') + padding,
-            menuHeight = $('#civicrm-menu').outerHeight(),
-            maxHeight = $(window).height() - menuHeight;
+            menuHeight = $('#civicrm-menu').outerHeight();
+          if ($('body').hasClass('crm-menubar-below-cms-menu')) {
+            menuHeight += $('#civicrm-menu').offset().top;
+          }
+          var maxHeight = $(window).height() - menuHeight;
           newHeight = newHeight > maxHeight ? maxHeight : newHeight;
           if (newHeight > (currentHeight + 15)) {
             $dialog.dialog('option', {