From a2d6e40f1b7e359b0be87452a01eb3e46b4694e8 Mon Sep 17 00:00:00 2001
From: Nathaniel Guse <nathaniel.guse@gmail.com>
Date: Mon, 15 Oct 2012 09:27:01 -0500
Subject: [PATCH] [ticket/11103] If no avatar, do not display an empty box in
 subsilver2

PHPBB3-11103
---
 phpBB/styles/subsilver2/template/overall_header.html | 12 ++++++++----
 .../subsilver2/template/ucp_notifications.html       | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/phpBB/styles/subsilver2/template/overall_header.html b/phpBB/styles/subsilver2/template/overall_header.html
index 62e251b709..e41095ad38 100644
--- a/phpBB/styles/subsilver2/template/overall_header.html
+++ b/phpBB/styles/subsilver2/template/overall_header.html
@@ -155,10 +155,14 @@ function marklist(id, name, state)
 						<table class="tablebg" width="310px" cellspacing="1">
 							<!-- BEGIN notifications -->
 								<tr>
-									<td class="row1" width="50px">
-										{notifications.AVATAR}
-									</td>
-									<td class="row1" valign="top">
+									<!-- IF notifications.AVATAR -->
+										<td class="row1" width="50px">
+											{notifications.AVATAR}
+										</td>
+										<td class="row1" valign="top">
+									<!-- ELSE -->
+										<td class="row1" colspan="2" valign="top">
+									<!-- ENDIF -->
 										<!-- IF notifications.URL or notifications.U_MARK_READ --><a href="<!-- IF notifications.UNREAD -->{notifications.U_MARK_READ}<!-- ELSE -->{notifications.URL}<!-- ENDIF -->"><!-- ENDIF -->
 											{notifications.FORMATTED_TITLE}
 										<!-- IF notifications.URL --></a><!-- ENDIF --><br />
diff --git a/phpBB/styles/subsilver2/template/ucp_notifications.html b/phpBB/styles/subsilver2/template/ucp_notifications.html
index 054e9a62b9..7c3a516521 100644
--- a/phpBB/styles/subsilver2/template/ucp_notifications.html
+++ b/phpBB/styles/subsilver2/template/ucp_notifications.html
@@ -89,10 +89,14 @@
 						</tr>
 						<!-- BEGIN notification_list -->
 							<!-- IF notification_list.UNREAD --><tr class="row3"><!-- ELSEIF notification_list.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
-								<td  width="50px">
-									{notification_list.AVATAR}
-								</td>
-								<td valign="top">
+								<!-- IF notification_list.AVATAR -->
+									<td  width="50px">
+										{notification_list.AVATAR}
+									</td>
+									<td valign="top">
+								<!-- ELSE -->
+									<td colspan="2" valign="top">
+								<!-- ENDIF -->
 									<!-- IF notification_list.URL or notification_list.U_MARK_READ --><a href="<!-- IF notification_list.UNREAD -->{notification_list.U_MARK_READ}<!-- ELSE -->{notification_list.URL}<!-- ENDIF -->"><!-- ENDIF -->
 										{notification_list.FORMATTED_TITLE}
 									<!-- IF notification_list.URL --></a><!-- ENDIF --><br />