diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-03-07 11:32:17 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-03-07 11:32:17 -0600 |
| commit | e826edb6fe3d34ad7aca175311babe65ea64e2db (patch) | |
| tree | 5a30cf547f213191fcfa32d75cc19ba36cf3fa79 | |
| parent | 0c8c8484d05dbb307e8b12a154664da8dabc0756 (diff) | |
| parent | 7ac945358ed5aefa947f29b359210a076c181a0a (diff) | |
| download | forums-e826edb6fe3d34ad7aca175311babe65ea64e2db.tar forums-e826edb6fe3d34ad7aca175311babe65ea64e2db.tar.gz forums-e826edb6fe3d34ad7aca175311babe65ea64e2db.tar.bz2 forums-e826edb6fe3d34ad7aca175311babe65ea64e2db.tar.xz forums-e826edb6fe3d34ad7aca175311babe65ea64e2db.zip | |
Merge remote-tracking branch 'remotes/nickv/ticket/11390' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11390:
[ticket/11390] Correctly separate list of notifications from header
[ticket/11390] Hide pagination when there are no notifications
| -rw-r--r-- | phpBB/styles/prosilver/template/ucp_notifications.html | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/styles/prosilver/template/ucp_notifications.html b/phpBB/styles/prosilver/template/ucp_notifications.html index 9004d235b4..82564efe10 100644 --- a/phpBB/styles/prosilver/template/ucp_notifications.html +++ b/phpBB/styles/prosilver/template/ucp_notifications.html @@ -48,6 +48,7 @@ <!-- END notification_types --> </ul> <!-- ELSE --> + <!-- IF .notification_list --> <!-- IF .pagination or TOTAL_COUNT --> <div class="topic-actions"> <div class="pagination"> @@ -70,13 +71,8 @@ <dd class="mark">{L_MARK_READ}</dd> </dl> </li> - <!-- IF not .notifications --> - <li> - <dl> - <dt>{L_NO_NOTIFICATIONS}</dt> - </dl> - </li> - <!-- ENDIF --> + </ul> + <ul class="topiclist cplist"> <!-- 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 -->"> <dl> @@ -114,6 +110,10 @@ </div> <!-- ENDIF --> + <!-- ELSE --> + <p><strong>{L_NO_NOTIFICATIONS}</strong></p> + <!-- ENDIF --> + <!-- ENDIF --> </div> </div> |