makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'remotes/nickv/ticket/11390' into develop

Browse source 
# 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
This commit is contained in:
Nathan Guse 2013-03-07 11:32:17 -06:00
commit e826edb6fe
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/styles/prosilver/template/ucp_notifications.html
View file

@ -48,6 +48,7 @@
<!-- END notification_types --> <!-- END notification_types -->
</ul> </ul>
<!-- ELSE --> <!-- ELSE -->
<!-- IF .notification_list -->
<!-- IF .pagination or TOTAL_COUNT --> <!-- IF .pagination or TOTAL_COUNT -->
<div class="topic-actions"> <div class="topic-actions">
<div class="pagination"> <div class="pagination">
@ -70,13 +71,8 @@
<dd class="mark">{L_MARK_READ}</dd> <dd class="mark">{L_MARK_READ}</dd>
</dl> </dl>
</li> </li>
<!-- IF not .notifications --> </ul>
<li> <ul class="topiclist cplist">
<dl>
<dt>{L_NO_NOTIFICATIONS}</dt>
</dl>
</li>
<!-- ENDIF -->
<!-- BEGIN notification_list --> <!-- 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 -->">
<dl> <dl>
@ -114,6 +110,10 @@
</div> </div>
<!-- ENDIF --> <!-- ENDIF -->
<!-- ELSE -->
<p><strong>{L_NO_NOTIFICATIONS}</strong></p>
<!-- ENDIF -->
<!-- ENDIF --> <!-- ENDIF -->
</div> </div>
</div> </div>