makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-21 10:48:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12329] changed all CSS classes to ".stat-block"
  [ticket/12329] Add <div> container to index blocks (stats, etc.)
This commit is contained in:
Joas Schilling 2014-04-01 15:07:45 +02:00
commit e4170e6c54
6 changed files with 30 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
phpBB/styles/prosilver/template/index_body.html
View file

@ -46,19 +46,25 @@
<!-- EVENT index_body_stat_blocks_before --> <!-- EVENT index_body_stat_blocks_before -->
<!-- IF S_DISPLAY_ONLINE_LIST --> <!-- IF S_DISPLAY_ONLINE_LIST -->
<!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF --> <div class="stat-block online-list">
<p>{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /> <br />{LOGGED_IN_USER_LIST} <!-- IF U_VIEWONLINE --><h3><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h3><!-- ELSE --><h3>{L_WHO_IS_ONLINE}</h3><!-- ENDIF -->
<!-- IF LEGEND --><br /><em>{L_LEGEND}{L_COLON} {LEGEND}</em><!-- ENDIF --></p> <p>{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})<br />{RECORD_USERS}<br /> <br />{LOGGED_IN_USER_LIST}
<!-- IF LEGEND --><br /><em>{L_LEGEND}{L_COLON} {LEGEND}</em><!-- ENDIF --></p>
</div>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_DISPLAY_BIRTHDAY_LIST --> <!-- IF S_DISPLAY_BIRTHDAY_LIST -->
<h3>{L_BIRTHDAYS}</h3> <div class="stat-block birthday-list">
<p><!-- IF .birthdays -->{L_CONGRATULATIONS}{L_COLON} <strong><!-- BEGIN birthdays -->{birthdays.USERNAME}<!-- IF birthdays.AGE !== '' --> ({birthdays.AGE})<!-- ENDIF --><!-- IF not birthdays.S_LAST_ROW -->, <!-- ENDIF --><!-- END birthdays --></strong><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></p> <h3>{L_BIRTHDAYS}</h3>
<p><!-- IF .birthdays -->{L_CONGRATULATIONS}{L_COLON} <strong><!-- BEGIN birthdays -->{birthdays.USERNAME}<!-- IF birthdays.AGE !== '' --> ({birthdays.AGE})<!-- ENDIF --><!-- IF not birthdays.S_LAST_ROW -->, <!-- ENDIF --><!-- END birthdays --></strong><!-- ELSE -->{L_NO_BIRTHDAYS}<!-- ENDIF --></p>
</div>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF NEWEST_USER --> <!-- IF NEWEST_USER -->
<h3>{L_STATISTICS}</h3> <div class="stat-block statistics">
<p>{TOTAL_POSTS} &bull; {TOTAL_TOPICS} &bull; {TOTAL_USERS} &bull; {NEWEST_USER}</p> <h3>{L_STATISTICS}</h3>
<p>{TOTAL_POSTS} &bull; {TOTAL_TOPICS} &bull; {TOTAL_USERS} &bull; {NEWEST_USER}</p>
</div>
<!-- ENDIF --> <!-- ENDIF -->
<!-- EVENT index_body_stat_blocks_after --> <!-- EVENT index_body_stat_blocks_after -->

12
phpBB/styles/prosilver/template/viewforum_body.html
View file

@ -241,13 +241,17 @@
<!-- INCLUDE jumpbox.html --> <!-- INCLUDE jumpbox.html -->
<!-- IF S_DISPLAY_ONLINE_LIST --> <!-- IF S_DISPLAY_ONLINE_LIST -->
<h3><!-- IF U_VIEWONLINE --><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a><!-- ELSE -->{L_WHO_IS_ONLINE}<!-- ENDIF --></h3> <div class="stat-block online-list">
<p>{LOGGED_IN_USER_LIST}</p> <h3><!-- IF U_VIEWONLINE --><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a><!-- ELSE -->{L_WHO_IS_ONLINE}<!-- ENDIF --></h3>
<p>{LOGGED_IN_USER_LIST}</p>
</div>
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_DISPLAY_POST_INFO --> <!-- IF S_DISPLAY_POST_INFO -->
<h3>{L_FORUM_PERMISSIONS}</h3> <div class="stat-block permissions">
<p><!-- BEGIN rules -->{rules.RULE}<br /><!-- END rules --></p> <h3>{L_FORUM_PERMISSIONS}</h3>
<p><!-- BEGIN rules -->{rules.RULE}<br /><!-- END rules --></p>
</div>
<!-- ENDIF --> <!-- ENDIF -->
<!-- INCLUDE overall_footer.html --> <!-- INCLUDE overall_footer.html -->

6
phpBB/styles/prosilver/template/viewtopic_body.html
View file

@ -343,8 +343,10 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_DISPLAY_ONLINE_LIST --> <!-- IF S_DISPLAY_ONLINE_LIST -->
<h3><!-- IF U_VIEWONLINE --><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a><!-- ELSE -->{L_WHO_IS_ONLINE}<!-- ENDIF --></h3> <div class="stat-block online-list">
<p>{LOGGED_IN_USER_LIST}</p> <h3><!-- IF U_VIEWONLINE --><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a><!-- ELSE -->{L_WHO_IS_ONLINE}<!-- ENDIF --></h3>
<p>{LOGGED_IN_USER_LIST}</p>
</div>
<!-- ENDIF --> <!-- ENDIF -->
<!-- INCLUDE overall_footer.html --> <!-- INCLUDE overall_footer.html -->

6
phpBB/styles/subsilver2/template/index_body.html
View file

@ -27,7 +27,7 @@
<!-- IF S_DISPLAY_ONLINE_LIST --> <!-- IF S_DISPLAY_ONLINE_LIST -->
<br clear="all" /> <br clear="all" />
<table class="tablebg" width="100%" cellspacing="1"> <table class="tablebg stat-block online-list" width="100%" cellspacing="1">
<tr> <tr>
<td class="cat" colspan="2"><!-- IF U_VIEWONLINE --><h4><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h4><!-- ELSE --><h4>{L_WHO_IS_ONLINE}</h4><!-- ENDIF --></td> <td class="cat" colspan="2"><!-- IF U_VIEWONLINE --><h4><a href="{U_VIEWONLINE}">{L_WHO_IS_ONLINE}</a></h4><!-- ELSE --><h4>{L_WHO_IS_ONLINE}</h4><!-- ENDIF --></td>
</tr> </tr>
@ -50,7 +50,7 @@
<!-- IF S_DISPLAY_BIRTHDAY_LIST --> <!-- IF S_DISPLAY_BIRTHDAY_LIST -->
<br clear="all" /> <br clear="all" />
<table class="tablebg" width="100%" cellspacing="1"> <table class="tablebg stat-block birthday-list" width="100%" cellspacing="1">
<tr> <tr>
<td class="cat" colspan="2"><h4>{L_BIRTHDAYS}</h4></td> <td class="cat" colspan="2"><h4>{L_BIRTHDAYS}</h4></td>
</tr> </tr>
@ -63,7 +63,7 @@
<br clear="all" /> <br clear="all" />
<table class="tablebg" width="100%" cellspacing="1"> <table class="tablebg stat-block statistics" width="100%" cellspacing="1">
<tr> <tr>
<td class="cat" colspan="2"><h4>{L_STATISTICS}</h4></td> <td class="cat" colspan="2"><h4>{L_STATISTICS}</h4></td>
</tr> </tr>

2
phpBB/styles/subsilver2/template/viewforum_body.html
View file

@ -293,7 +293,7 @@
<!-- IF S_DISPLAY_ONLINE_LIST --> <!-- IF S_DISPLAY_ONLINE_LIST -->
<br clear="all" /> <br clear="all" />
<table class="tablebg" width="100%" cellspacing="1"> <table class="tablebg stat-block online-list" width="100%" cellspacing="1">
<tr> <tr>
<td class="cat"><h4>{L_WHO_IS_ONLINE}</h4></td> <td class="cat"><h4>{L_WHO_IS_ONLINE}</h4></td>
</tr> </tr>

2
phpBB/styles/subsilver2/template/viewtopic_body.html
View file

@ -387,7 +387,7 @@
<!-- IF S_DISPLAY_ONLINE_LIST --> <!-- IF S_DISPLAY_ONLINE_LIST -->
<br clear="all" /> <br clear="all" />
<table class="tablebg" width="100%" cellspacing="1"> <table class="tablebg stat-block online-list" width="100%" cellspacing="1">
<tr> <tr>
<td class="cat"><h4>{L_WHO_IS_ONLINE}</h4></td> <td class="cat"><h4>{L_WHO_IS_ONLINE}</h4></td>
</tr> </tr>