From a14930466b40611cf5190be3fed41ee03a381e44 Mon Sep 17 00:00:00 2001 From: PayBas Date: Wed, 9 Apr 2014 00:31:10 +0200 Subject: [PATCH 1/4] [ticket/12374] Add Template events index_body_block_(name)_append Hopefully to the correct branch this time PHPBB3-12374 --- phpBB/docs/events.md | 24 +++++++++++++++++++ .../styles/prosilver/template/index_body.html | 6 ++--- .../subsilver2/template/index_body.html | 7 +++--- 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 1cc1300c05..214e1c8e39 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -186,6 +186,30 @@ forumlist_body_last_row_after * Since: 3.1.0-b2 * Purpose: Add content after the very last row of the forum list. +index_body_block_online_append +=== +* Locations: + + styles/prosilver/template/index_body.html + + styles/subsilver2/template/index_body.html +* Since: 3.1.0-b3 +* Purpose: Append content to the online list on the Board index + +index_body_block_birthday_append +=== +* Locations: + + styles/prosilver/template/index_body.html + + styles/subsilver2/template/index_body.html +* Since: 3.1.0-b3 +* Purpose: Append content to the birthday list on the Board index + +index_body_block_stats_append +=== +* Locations: + + styles/prosilver/template/index_body.html + + styles/subsilver2/template/index_body.html +* Since: 3.1.0-b3 +* Purpose: Append content to the statistics list on the Board index + index_body_linklist_after === * Locations: diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html index 3e9aae28e3..5ccf978a9b 100644 --- a/phpBB/styles/prosilver/template/index_body.html +++ b/phpBB/styles/prosilver/template/index_body.html @@ -49,21 +49,21 @@

{L_WHO_IS_ONLINE}

{L_WHO_IS_ONLINE}

{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})
{RECORD_USERS}

{LOGGED_IN_USER_LIST} -
{L_LEGEND}{L_COLON} {LEGEND}

+
{L_LEGEND}{L_COLON} {LEGEND}

{L_BIRTHDAYS}

-

{L_CONGRATULATIONS}{L_COLON} {birthdays.USERNAME} ({birthdays.AGE}), {L_NO_BIRTHDAYS}

+

{L_CONGRATULATIONS}{L_COLON} {birthdays.USERNAME} ({birthdays.AGE}), {L_NO_BIRTHDAYS}

{L_STATISTICS}

-

{TOTAL_POSTS} • {TOTAL_TOPICS} • {TOTAL_USERS} • {NEWEST_USER}

+

{TOTAL_POSTS} • {TOTAL_TOPICS} • {TOTAL_USERS} • {NEWEST_USER}

diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html index 9e859eac0e..7c021afe51 100644 --- a/phpBB/styles/subsilver2/template/index_body.html +++ b/phpBB/styles/subsilver2/template/index_body.html @@ -44,7 +44,7 @@ {L_WHO_IS_ONLINE} - {TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})
{RECORD_USERS}

{LOGGED_IN_USER_LIST} + {TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})
{RECORD_USERS}

{LOGGED_IN_USER_LIST} @@ -63,7 +63,7 @@ {L_BIRTHDAYS} -

{L_CONGRATULATIONS}{L_COLON} {birthdays.USERNAME} ({birthdays.AGE}), {L_NO_BIRTHDAYS}

+

{L_CONGRATULATIONS}{L_COLON} {birthdays.USERNAME} ({birthdays.AGE}), {L_NO_BIRTHDAYS}

@@ -76,7 +76,8 @@ {L_STATISTICS} -

{TOTAL_POSTS} | {TOTAL_TOPICS} | {TOTAL_USERS} | {NEWEST_USER}

+

{TOTAL_POSTS} | {TOTAL_TOPICS} | {TOTAL_USERS} | {NEWEST_USER}

+ From bb7941a52bb7b45af93bf98133e6cba29563eb42 Mon Sep 17 00:00:00 2001 From: PayBas Date: Fri, 11 Apr 2014 12:11:08 +0200 Subject: [PATCH 2/4] [ticket/12374] Updated code layout PHPBB3-12374 --- .../styles/prosilver/template/index_body.html | 17 ++++++++++---- .../subsilver2/template/index_body.html | 22 +++++++++++++++---- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html index 5ccf978a9b..91c90fe600 100644 --- a/phpBB/styles/prosilver/template/index_body.html +++ b/phpBB/styles/prosilver/template/index_body.html @@ -48,22 +48,31 @@

{L_WHO_IS_ONLINE}

{L_WHO_IS_ONLINE}

-

{TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})
{RECORD_USERS}

{LOGGED_IN_USER_LIST} -
{L_LEGEND}{L_COLON} {LEGEND}

+

+ {TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})
{RECORD_USERS}

{LOGGED_IN_USER_LIST} +
{L_LEGEND}{L_COLON} {LEGEND} + +

{L_BIRTHDAYS}

-

{L_CONGRATULATIONS}{L_COLON} {birthdays.USERNAME} ({birthdays.AGE}), {L_NO_BIRTHDAYS}

+

+ {L_CONGRATULATIONS}{L_COLON} {birthdays.USERNAME} ({birthdays.AGE}), {L_NO_BIRTHDAYS} + +

{L_STATISTICS}

-

{TOTAL_POSTS} • {TOTAL_TOPICS} • {TOTAL_USERS} • {NEWEST_USER}

+

+ {TOTAL_POSTS} • {TOTAL_TOPICS} • {TOTAL_USERS} • {NEWEST_USER} + +

diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html index 7c021afe51..97bf96f997 100644 --- a/phpBB/styles/subsilver2/template/index_body.html +++ b/phpBB/styles/subsilver2/template/index_body.html @@ -44,7 +44,12 @@ {L_WHO_IS_ONLINE} - {TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})
{RECORD_USERS}

{LOGGED_IN_USER_LIST} + + + {TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})
{RECORD_USERS}

{LOGGED_IN_USER_LIST} + + + @@ -63,7 +68,12 @@ {L_BIRTHDAYS} -

{L_CONGRATULATIONS}{L_COLON} {birthdays.USERNAME} ({birthdays.AGE}), {L_NO_BIRTHDAYS}

+ +

+ {L_CONGRATULATIONS}{L_COLON} {birthdays.USERNAME} ({birthdays.AGE}), {L_NO_BIRTHDAYS} + +

+ @@ -76,8 +86,12 @@ {L_STATISTICS} -

{TOTAL_POSTS} | {TOTAL_TOPICS} | {TOTAL_USERS} | {NEWEST_USER}

- + +

+ {TOTAL_POSTS} | {TOTAL_TOPICS} | {TOTAL_USERS} | {NEWEST_USER} + +

+ From 8186e282f11c65874303833e081186ad6a744371 Mon Sep 17 00:00:00 2001 From: PayBas Date: Fri, 11 Apr 2014 12:24:27 +0200 Subject: [PATCH 3/4] [ticket/12374] Added prepend-versions of events PHPBB3-12374 --- phpBB/docs/events.md | 24 +++++++++++++++++++ .../styles/prosilver/template/index_body.html | 3 +++ .../subsilver2/template/index_body.html | 3 +++ 3 files changed, 30 insertions(+) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 214e1c8e39..9f2e0f6577 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -194,6 +194,14 @@ index_body_block_online_append * Since: 3.1.0-b3 * Purpose: Append content to the online list on the Board index +index_body_block_online_prepend +=== +* Locations: + + styles/prosilver/template/index_body.html + + styles/subsilver2/template/index_body.html +* Since: 3.1.0-b3 +* Purpose: Prepend content to the online list on the Board index + index_body_block_birthday_append === * Locations: @@ -202,6 +210,14 @@ index_body_block_birthday_append * Since: 3.1.0-b3 * Purpose: Append content to the birthday list on the Board index +index_body_block_birthday_prepend +=== +* Locations: + + styles/prosilver/template/index_body.html + + styles/subsilver2/template/index_body.html +* Since: 3.1.0-b3 +* Purpose: Prepend content to the birthday list on the Board index + index_body_block_stats_append === * Locations: @@ -210,6 +226,14 @@ index_body_block_stats_append * Since: 3.1.0-b3 * Purpose: Append content to the statistics list on the Board index +index_body_block_stats_prepend +=== +* Locations: + + styles/prosilver/template/index_body.html + + styles/subsilver2/template/index_body.html +* Since: 3.1.0-b3 +* Purpose: Prepend content to the statistics list on the Board index + index_body_linklist_after === * Locations: diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html index 91c90fe600..f9c5b4cf20 100644 --- a/phpBB/styles/prosilver/template/index_body.html +++ b/phpBB/styles/prosilver/template/index_body.html @@ -49,6 +49,7 @@

{L_WHO_IS_ONLINE}

{L_WHO_IS_ONLINE}

+ {TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})
{RECORD_USERS}

{LOGGED_IN_USER_LIST}
{L_LEGEND}{L_COLON} {LEGEND} @@ -60,6 +61,7 @@

{L_BIRTHDAYS}

+ {L_CONGRATULATIONS}{L_COLON} {birthdays.USERNAME} ({birthdays.AGE}), {L_NO_BIRTHDAYS}

@@ -70,6 +72,7 @@

{L_STATISTICS}

+ {TOTAL_POSTS} • {TOTAL_TOPICS} • {TOTAL_USERS} • {NEWEST_USER}

diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html index 97bf96f997..cb67768b15 100644 --- a/phpBB/styles/subsilver2/template/index_body.html +++ b/phpBB/styles/subsilver2/template/index_body.html @@ -46,6 +46,7 @@ + {TOTAL_USERS_ONLINE} ({L_ONLINE_EXPLAIN})
{RECORD_USERS}

{LOGGED_IN_USER_LIST} @@ -70,6 +71,7 @@ {L_BIRTHDAYS}

+ {L_CONGRATULATIONS}{L_COLON} {birthdays.USERNAME} ({birthdays.AGE}), {L_NO_BIRTHDAYS}

@@ -88,6 +90,7 @@ {L_STATISTICS}

+ {TOTAL_POSTS} | {TOTAL_TOPICS} | {TOTAL_USERS} | {NEWEST_USER}

From aa5adbf1f78dbe9f331f43447c842bc3a148d186 Mon Sep 17 00:00:00 2001 From: PayBas Date: Fri, 11 Apr 2014 17:01:29 +0200 Subject: [PATCH 4/4] [ticket/12374] Fixed alphabetical sorting PHPBB3-12374 --- phpBB/docs/events.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 9f2e0f6577..df181fe096 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -186,22 +186,6 @@ forumlist_body_last_row_after * Since: 3.1.0-b2 * Purpose: Add content after the very last row of the forum list. -index_body_block_online_append -=== -* Locations: - + styles/prosilver/template/index_body.html - + styles/subsilver2/template/index_body.html -* Since: 3.1.0-b3 -* Purpose: Append content to the online list on the Board index - -index_body_block_online_prepend -=== -* Locations: - + styles/prosilver/template/index_body.html - + styles/subsilver2/template/index_body.html -* Since: 3.1.0-b3 -* Purpose: Prepend content to the online list on the Board index - index_body_block_birthday_append === * Locations: @@ -218,6 +202,22 @@ index_body_block_birthday_prepend * Since: 3.1.0-b3 * Purpose: Prepend content to the birthday list on the Board index +index_body_block_online_append +=== +* Locations: + + styles/prosilver/template/index_body.html + + styles/subsilver2/template/index_body.html +* Since: 3.1.0-b3 +* Purpose: Append content to the online list on the Board index + +index_body_block_online_prepend +=== +* Locations: + + styles/prosilver/template/index_body.html + + styles/subsilver2/template/index_body.html +* Since: 3.1.0-b3 +* Purpose: Prepend content to the online list on the Board index + index_body_block_stats_append === * Locations: