Improved notification list for legacy notifications

diff --git a/com.woltlab.wcf/templates/notificationList.tpl b/com.woltlab.wcf/templates/notificationList.tpl
index fb8aa489dc4d33169b12475eb11f292c4bc08988..a4372cd07327a516e1bea84cff392f9a322a77de 100644 (file)
--- 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 58d1dfcf67d17ad9688a1674a9fe399cb26f0512..8dfea5b75452b90afd2781bf4cb32f08e205e4c9 100644 (file)
--- 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>';
                                });