Merge pull request #1789 from VSEphpbb/ticket/11936

[Ticket/11936] Notification Avatars - Fixes and Restyling

phpBB/styles/prosilver/template/overall_header.html

@@ -118,8 +118,8 @@
 							<!-- BEGIN notifications -->
 								<li class="<!-- IF notifications.UNREAD --> bg2<!-- ENDIF -->">
 									<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
-										{notifications.AVATAR}
-										<div>
+										<!-- IF notifications.AVATAR -->{notifications.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF -->
+										<div class="notification_text">
 											<p>{notifications.FORMATTED_TITLE}</p>
 											<p>&raquo; {notifications.TIME}</p>
 

phpBB/styles/prosilver/template/ucp_notifications.html

@@ -68,18 +68,17 @@
 						<li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF -->">
 							<dl>
 								<dt>
-									<div class="list-inner">
-										<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
-											{notification_list.AVATAR}
-											<div class="notifications">
-												<p class="notifications_title">{notification_list.FORMATTED_TITLE}</p>
-												<p class="notifications_time">&raquo; {notification_list.TIME}</p>
-
-												<!-- IF not notification_list.URL and notification_list.U_MARK_READ -->
-													<p><a href="{notification_list.U_MARK_READ}">{L_MARK_READ}</a></p>
-												<!-- ENDIF -->
-											</div>
-										<!-- IF notification_list.URL --></a><!-- ENDIF -->
+									<div class="list-inner">										
+										<!-- IF notification_list.AVATAR -->{notification_list.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF -->
+										<div class="notifications">
+											<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
+											<p class="notifications_title">{notification_list.FORMATTED_TITLE}</p>
+											<!-- IF notification_list.URL --></a><!-- ENDIF -->
+											<p class="notifications_time">{notification_list.TIME}</p>
+											<!-- IF not notification_list.URL and notification_list.U_MARK_READ -->
+												<p><a href="{notification_list.U_MARK_READ}">{L_MARK_READ}</a></p>
+											<!-- ENDIF -->
+										</div>
 									</div>
 								</dt>
 

phpBB/styles/prosilver/theme/common.css

@@ -875,6 +875,7 @@ form > p.post-notice strong {
 
 #notification_list ul li a, .notification_list dt > a, #notification_list > .footer > a {
 	display: block;
+	text-decoration: none;
 }
 
 .notification_list ul li img {
@@ -918,11 +919,19 @@ form > p.post-notice strong {
 }
 
 .notification_list p.notifications_title {
+	font-family: "Trebuchet MS", Arial, Helvetica, sans-serif;
+	font-size: 13px !important;
 	font-weight: bold;
 }
 
 .notification_list p.notifications_time {
-	font-size: 11px;
+	font-size: 11px !important;
+}
+
+.notification_text:after {
+	content: '';
+	clear: both;
+	display: block;
 }
 
 .compact .icon-notification > a > span, .compact .icon-pm > a > span {
@@ -932,4 +941,3 @@ form > p.post-notice strong {
 .compact .icon-notification > a > strong, .compact .icon-pm > a > strong {
 	padding-left: 2px;
 }
-

phpBB/styles/subsilver2/template/overall_header.html

@@ -160,17 +160,13 @@ function marklist(id, name, state)
 						</div>
 
 						<div class="notification_scroll">
-							<table class="tablebg" width="310px" cellspacing="1">
+							<table class="tablebg" width="310" cellspacing="1">
 								<!-- BEGIN notifications -->
 									<tr class="row<!-- IF notifications.UNREAD -->2<!-- ELSE -->1<!-- ENDIF -->">
-										<!-- IF notifications.AVATAR -->
-											<td width="50px">
-												{notifications.AVATAR}
-											</td>
-											<td valign="top">
-										<!-- ELSE -->
-											<td colspan="2" valign="top">
-										<!-- ENDIF -->
+										<td width="50">
+											<!-- IF notifications.AVATAR -->{notifications.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF -->
+										</td>
+										<td valign="top">
 											<div class="notification_title">
 												<!-- IF notifications.URL --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
 													{notifications.FORMATTED_TITLE}

phpBB/styles/subsilver2/template/ucp_notifications.html

@@ -86,19 +86,15 @@
 			</tr>
 			<!-- BEGIN notification_list -->
 				<tr class="row<!-- IF notification_list.UNREAD -->3<!-- ELSEIF notification_list.S_ROW_COUNT is even -->1<!-- ELSE -->2<!-- ENDIF -->">
-					<!-- IF notification_list.AVATAR -->
-						<td width="50px">
-							{notification_list.AVATAR}
-						</td>
-						<td valign="top">
-					<!-- ELSE -->
-						<td colspan="2" valign="top" height="50px">
-					<!-- ENDIF -->
+					<td width="50">
+						<!-- IF notification_list.AVATAR -->{notification_list.AVATAR}<!-- ELSE --><img src="{T_THEME_PATH}/images/no_avatar.gif" alt="" /><!-- ENDIF -->
+					</td>
+					<td valign="top">
 						<span class="gen">
 						<!-- IF notification_list.URL --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
 							<strong>{notification_list.FORMATTED_TITLE}</strong>
 						<!-- IF notification_list.URL --></a><!-- ENDIF --><br />
-						&raquo; {notification_list.TIME}
+						{notification_list.TIME}
 						</span>
 					</td>
 					<td align="center">