Merge pull request #2819 from Hypolite/Issue-#2814

Fix #2814

js/main.js

@@ -130,6 +130,7 @@
 		function close_last_popup_menu() {
 			if(last_popup_menu) {
 				last_popup_menu.hide();
+				last_popup_menu.off('click', function(e) {e.stopPropagation()});
 				last_popup_button.removeClass("selected");
 				last_popup_menu = null;
 				last_popup_button = null;
@@ -152,6 +153,7 @@
 				last_popup_button = null;
 			} else {
 				last_popup_menu = menu;
+				last_popup_menu.on('click', function(e) {e.stopPropagation()});
 				last_popup_button = parent;
 				$('#nav-notifications-menu').perfectScrollbar('update');
 			}

view/theme/frio/templates/nav.tpl

@@ -276,13 +276,13 @@
 {{*The second part of the notifications dropdown menu. It handles the notifications *}}
 {{if $nav.notifications}}
 <ul id="nav-notifications-template" class="media-list" style="display:none;" rel="template"> <!-- needs further investigation. I thought the notifications have their own templates -->
-	<li class="{4} notif-entry" onclick="location.href='{0}';">
+	<li class="{4} notif-entry">
 		<div class="notif-entry-wrapper media">
 			<div class="notif-photo-wrapper media-object pull-left"><a href="{6}"><img data-src="{1}"></a></div>
-			<div class="notif-desc-wrapper media-body">
-				{8}{7}
+			<a href="{0}" class="notif-desc-wrapper media-body">
+				{2}
 				<div><time class="notif-when time" data-toggle="tooltip" title="{5}">{3}</time></div>
-			</div>
+			</a>
 		</div>
 	</li>
 </ul>