From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 11 Mar 2015 14:23:42 +0000 (+0100)
Subject: Improved notification list for legacy notifications
X-Git-Tag: 2.1.2~57
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b2d96d9f37bbcf358fff2717d918e8df18699b78;p=GitHub%2FWoltLab%2FWCF.git

Improved notification list for legacy notifications
---

diff --git a/com.woltlab.wcf/templates/notificationList.tpl b/com.woltlab.wcf/templates/notificationList.tpl
index fb8aa489dc..a4372cd073 100644
--- a/com.woltlab.wcf/templates/notificationList.tpl
+++ b/com.woltlab.wcf/templates/notificationList.tpl
@@ -67,7 +67,7 @@
 				<li class="jsNotificationItem notificationItem{if $notification[authors] > 1} groupedNotificationItem{/if}{if !$notification[event]->isConfirmed()} notificationUnconfirmed{/if}" data-link="{if $notification[event]->isConfirmed()}{$notification[event]->getLink()}{else}{link controller='NotificationConfirm' id=$notification[notificationID]}{/link}{/if}" data-link-replace-all="{if $notification[event]->isConfirmed()}false{else}true{/if}" data-object-id="{@$notification[notificationID]}" data-is-read="{if $notification[event]->isConfirmed()}true{else}false{/if}" data-is-grouped="{if $notification[authors] > 1}true{else}false{/if}">
 					<div class="box32">
 						{if $notification[authors] < 2}
-							<div class="framed">
+							<div class="framed jsTooltip" title="{$notification[event]->getAuthor()->username}">
 								{@$notification[event]->getAuthor()->getAvatar()->getImageTag(32)}
 							</div>
 							
diff --git a/wcfsetup/install/files/js/WCF.User.js b/wcfsetup/install/files/js/WCF.User.js
index 58d1dfcf67..8dfea5b754 100644
--- a/wcfsetup/install/files/js/WCF.User.js
+++ b/wcfsetup/install/files/js/WCF.User.js
@@ -1750,7 +1750,7 @@ WCF.Notification.List = Class.extend({
 			}
 			
 			// work-around for legacy notifications
-			if (!$item.find('a').length) {
+			if (!$item.find('a:not(.notificationItemMarkAsConfirmed)').length) {
 				$item.find('.details > p:eq(0)').html(function(index, oldHTML) {
 					return '<a href="' + $item.data('link') + '">' + oldHTML + '</a>';
 				});