diff --git a/api/js/framework/fw_desktop.js b/api/js/framework/fw_desktop.js index 2f27562558..8754a004e9 100644 --- a/api/js/framework/fw_desktop.js +++ b/api/js/framework/fw_desktop.js @@ -467,7 +467,7 @@ if (!$menu.is(":visible")) { $body.on('click', function(e){ - if (e.target.id != 'topmenu_info_user_avatar') + if (e.target.id != 'topmenu_info_user_avatar' && jQuery(e.target).parents('#topmenu_info_user_avatar').length < 1) { jQuery(this).off(e); $menu.toggle(); diff --git a/api/src/Framework.php b/api/src/Framework.php index a25cc56515..a6f7a32ed6 100644 --- a/api/src/Framework.php +++ b/api/src/Framework.php @@ -639,7 +639,7 @@ abstract class Framework extends Framework\Extra return ''.(!empty($stat) ? - ''.$stat['body'].'' : '').''; + ''.$stat['body'].'' : '').''; } /** diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css index f663c1dcc7..f32d86a781 100644 --- a/pixelegg/css/mobile.css +++ b/pixelegg/css/mobile.css @@ -4931,11 +4931,9 @@ td.message span.message { border: none; margin-top: 2px; margin-left: 1px; - pointer-events: none; } #egw_fw_topmenu_info_items #topmenu_info_user_avatar span img { width: 40px; - pointer-events: none; } #egw_fw_topmenu_info_items #topmenu_info_user_avatar span span.fw_avatar_stat { position: absolute; diff --git a/pixelegg/css/monochrome.css b/pixelegg/css/monochrome.css index c4d9d5ffb3..9764a853ac 100644 --- a/pixelegg/css/monochrome.css +++ b/pixelegg/css/monochrome.css @@ -4920,11 +4920,9 @@ td.message span.message { border: none; margin-top: 2px; margin-left: 1px; - pointer-events: none; } #egw_fw_topmenu_info_items #topmenu_info_user_avatar span img { width: 40px; - pointer-events: none; } #egw_fw_topmenu_info_items #topmenu_info_user_avatar span span.fw_avatar_stat { position: absolute; diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css index ea70ec569f..13993a3129 100644 --- a/pixelegg/css/pixelegg.css +++ b/pixelegg/css/pixelegg.css @@ -4931,11 +4931,9 @@ td.message span.message { border: none; margin-top: 2px; margin-left: 1px; - pointer-events: none; } #egw_fw_topmenu_info_items #topmenu_info_user_avatar span img { width: 40px; - pointer-events: none; } #egw_fw_topmenu_info_items #topmenu_info_user_avatar span span.fw_avatar_stat { position: absolute; diff --git a/pixelegg/less/layout_raster_buttons.less b/pixelegg/less/layout_raster_buttons.less index 1745884ffc..c1e6fe2ed1 100644 --- a/pixelegg/less/layout_raster_buttons.less +++ b/pixelegg/less/layout_raster_buttons.less @@ -49,10 +49,8 @@ border: none; margin-top: 2px; margin-left: 1px; - pointer-events: none; img { width: 40px; - pointer-events: none; } span.fw_avatar_stat { position: absolute; diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css index fc51e41288..f57e673026 100644 --- a/pixelegg/mobile/fw_mobile.css +++ b/pixelegg/mobile/fw_mobile.css @@ -4942,11 +4942,9 @@ td.message span.message { border: none; margin-top: 2px; margin-left: 1px; - pointer-events: none; } #egw_fw_topmenu_info_items #topmenu_info_user_avatar span img { width: 40px; - pointer-events: none; } #egw_fw_topmenu_info_items #topmenu_info_user_avatar span span.fw_avatar_stat { position: absolute;