1 files changed, 25 insertions, 30 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html
index 6a711cfd30..a7eb7fc8fb 100644
--- a/phpBB/styles/prosilver/template/ucp_notifications.html
+++ b/phpBB/styles/prosilver/template/ucp_notifications.html
@@ -11,11 +11,12 @@
 		<!-- IF MODE == 'notification_options' -->
 			<table class="table1">
 				<thead>
-					<th>{L_NOTIFICATION_TYPE}</th>
-					<!-- BEGIN notification_methods -->
-						<th class="mark">{notification_methods.NAME}</th>
-					<!-- END notification_methods -->
-					<th class="mark">{L_NOTIFICATIONS}</th>
+					<tr>
+						<th>{L_NOTIFICATION_TYPE}</th>
+						<!-- BEGIN notification_methods -->
+							<th class="mark">{notification_methods.NAME}</th>
+						<!-- END notification_methods -->
+					</tr>
 				</thead>
 				<tbody>
 				<!-- BEGIN notification_types -->
@@ -32,7 +33,6 @@
 							<!-- BEGIN notification_methods -->
 								<td class="mark"><input type="checkbox" name="{notification_types.TYPE}_{notification_methods.METHOD}"<!-- IF notification_methods.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td>
 							<!-- END notification_methods -->
-							<td class="mark"><input type="checkbox" name="{notification_types.TYPE}_notification"<!-- IF notification_types.SUBSCRIBED --> checked="checked"<!-- ENDIF --> /></td>
 						</tr>
 					<!-- ENDIF -->
 				<!-- END notification_types -->
@@ -40,19 +40,17 @@
 			</table>
 		<!-- ELSE -->
 			<!-- IF .notification_list -->
-			<!-- IF .pagination or TOTAL_COUNT -->
-				<div class="topic-actions">
+				<div class="action-bar bar-top">
 					<div class="pagination">
-						<!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}">{L_NOTIFICATIONS_MARK_ALL_READ}</a> &bull; <!-- ENDIF -->
-						<!-- IF TOTAL_COUNT -->{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>] &bull; <!-- ENDIF -->
+						<!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}" class="mark">{L_NOTIFICATIONS_MARK_ALL_READ}</a> &bull; <!-- ENDIF -->
+						{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>]
 						<!-- IF .pagination -->
 							<!-- INCLUDE pagination.html -->
 						<!-- ELSE -->
-							{PAGE_NUMBER}
+							 &bull; {PAGE_NUMBER}
 						<!-- ENDIF -->
 					</div>
 				</div>
-			<!-- ENDIF -->
 
 			<div class="notification_list">
 				<ul class="topiclist two-columns">
@@ -65,19 +63,18 @@
 				</ul>
 				<ul class="topiclist cplist two-columns">
 					<!-- BEGIN notification_list -->
-						<li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF -->">
+						<li class="row<!-- IF notification_list.UNREAD --> bg3<!-- ELSE --><!-- IF notification_list.S_ROW_COUNT is odd --> bg1<!-- ELSE --> bg2<!-- ENDIF --><!-- ENDIF --><!-- IF notification_list.STYLING --> {notification_list.STYLING}<!-- ENDIF -->">
 							<dl>
 								<dt>
 									<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_title">{notification_list.FORMATTED_TITLE}<!-- IF notification_list.REFERENCE --> {notification_list.REFERENCE}<!-- ENDIF --></p>
+											<!-- IF notification_list.URL --></a><!-- ENDIF -->				
+											<!-- IF notification_list.FORUM --><p class="notifications_forum">{notification_list.FORUM}</p><!-- ENDIF -->
+											<!-- IF notification_list.REASON --><p class="notifications_reason">{notification_list.REASON}</p><!-- 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>
@@ -89,18 +86,16 @@
 				</ul>
 			</div>
 
-			<!-- IF .pagination or TOTAL_COUNT -->
-				<div class="topic-actions">
-					<div class="pagination">
-						<!-- IF TOTAL_COUNT -->{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>] &bull; <!-- ENDIF -->
-						<!-- IF .pagination -->
-							<!-- INCLUDE pagination.html -->
-						<!-- ELSE -->
-							{PAGE_NUMBER}
-						<!-- ENDIF -->
-					</div>
+			<div class="action-bar bar-bottom">
+				<div class="pagination">
+					{L_NOTIFICATIONS} [<strong>{TOTAL_COUNT}</strong>]
+					<!-- IF .pagination -->
+						<!-- INCLUDE pagination.html -->
+					<!-- ELSE -->
+						  &bull; {PAGE_NUMBER}
+					<!-- ENDIF -->
 				</div>
-			<!-- ENDIF -->
+			</div>
 
 			<!-- ELSE -->
 				<p><strong>{L_NO_NOTIFICATIONS}</strong></p>
@@ -115,7 +110,7 @@
 	<input type="hidden" name="form_time" value="{FORM_TIME}" />
 	{S_HIDDEN_FIELDS}
 	<input type="submit" name="submit" value="<!-- IF MODE == 'notification_options' -->{L_SUBMIT}<!-- ELSE -->{L_MARK_READ}<!-- ENDIF -->" class="button1" />
-	<div><a href="#" onclick="$('#ucp input:checkbox').attr('checked', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="$('#ucp input:checkbox').attr('checked', false); return false;">{L_UNMARK_ALL}</a></div>
+	<div><a href="#" onclick="$('#ucp input:checkbox').prop('checked', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="$('#ucp input:checkbox').prop('checked', false); return false;">{L_UNMARK_ALL}</a></div>
 	{S_FORM_TOKEN}
 </fieldset>
 <!-- ENDIF -->