From 23bf9d0c42771639ea7df948e4bdbe02eeda7564 Mon Sep 17 00:00:00 2001 From: Crizzo Date: Wed, 16 Apr 2014 21:03:03 +0200 Subject: [PATCH 1/4] [ticket/12404] Adds a new event before and after the Timezone display PHPBB3-12404 --- phpBB/docs/events.md | 16 ++++++++++++++++ .../styles/prosilver/template/navbar_footer.html | 4 +++- .../styles/subsilver2/template/breadcrumbs.html | 2 ++ 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 6897c3f22e..6d241e4356 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -275,6 +275,22 @@ overall_footer_page_body_after * Since: 3.1.0-b3 * Purpose: Add content after the page-body, but before the footer +overall_footer_timezone_prepend +=== +* Locations: + + styles/prosilver/template/navbar_footer.html + + styles/subsilver2/template/breadcrumbs.html +* Since: 3.1.0-b3 +* Purpose: Add new List-Elements to the navbar in the page footer, before Timezone + +overall_footer_timezone_append +=== +* Locations: + + styles/prosilver/template/navbar_footer.html + + styles/subsilver2/template/breadcrumbs.html +* Since: 3.1.0-b3 +* Purpose: Add new List-Elements to the navbar in the page footer, after "The Team" + overall_header_body_before === * Locations: diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html index 32cbecdf8c..9e52a7d969 100644 --- a/phpBB/styles/prosilver/template/navbar_footer.html +++ b/phpBB/styles/prosilver/template/navbar_footer.html @@ -8,9 +8,11 @@
  • {S_WATCH_FORUM_TITLE}
    • +
  • {S_TIMEZONE}
  • {L_DELETE_COOKIES}
    • -
  • {L_THE_TEAM} +
  • {L_THE_TEAM}
    • + diff --git a/phpBB/styles/subsilver2/template/breadcrumbs.html b/phpBB/styles/subsilver2/template/breadcrumbs.html index 09ee9a8606..55f8c70a9c 100644 --- a/phpBB/styles/subsilver2/template/breadcrumbs.html +++ b/phpBB/styles/subsilver2/template/breadcrumbs.html @@ -4,7 +4,9 @@

    {L_SITE_HOME} » {L_INDEX} » {navlinks.FORUM_NAME}

    +

    {S_TIMEZONE}

    + From 94c21684ffd04a069c56c4e93e0ac846f090ec51 Mon Sep 17 00:00:00 2001 From: Crizzo Date: Tue, 22 Apr 2014 21:24:20 +0200 Subject: [PATCH 2/4] [ticket/12404] Adds two new events and changes some places PHPBB3-12404 --- phpBB/docs/events.md | 24 +++++++++++++++---- .../prosilver/template/navbar_footer.html | 6 +++-- .../subsilver2/template/index_body.html | 2 +- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 6d241e4356..2b87d0a4aa 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -275,13 +275,21 @@ overall_footer_page_body_after * Since: 3.1.0-b3 * Purpose: Add content after the page-body, but before the footer -overall_footer_timezone_prepend +overall_footer_teamlink_append === * Locations: + styles/prosilver/template/navbar_footer.html - + styles/subsilver2/template/breadcrumbs.html + + styles/subsilver2/template/index_body.html * Since: 3.1.0-b3 -* Purpose: Add new List-Elements to the navbar in the page footer, before Timezone +* Purpose: Add contents after the team-link in the footer + +overall_footer_teamlink_prepend +=== +* Locations: + + styles/prosilver/template/navbar_footer.html + + styles/subsilver2/template/index_body.html +* Since: 3.1.0-b3 +* Purpose: Add contents before the team-link in the footer overall_footer_timezone_append === @@ -289,7 +297,15 @@ overall_footer_timezone_append + styles/prosilver/template/navbar_footer.html + styles/subsilver2/template/breadcrumbs.html * Since: 3.1.0-b3 -* Purpose: Add new List-Elements to the navbar in the page footer, after "The Team" +* Purpose: Add content (must be inner
  • ) to the navbar in the page footer, after "Timezone" + +overall_footer_timezone_prepend +=== +* Locations: + + styles/prosilver/template/navbar_footer.html + + styles/subsilver2/template/breadcrumbs.html +* Since: 3.1.0-b3 +* Purpose: Add content(must be inner
  • ) to the navbar in the page footer, before "Timezone" overall_header_body_before === diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html index 9e52a7d969..127c41558e 100644 --- a/phpBB/styles/prosilver/template/navbar_footer.html +++ b/phpBB/styles/prosilver/template/navbar_footer.html @@ -10,9 +10,11 @@
  • {S_TIMEZONE}
    • -
  • {L_DELETE_COOKIES}
    • -
  • {L_THE_TEAM}
    • +
  • {L_DELETE_COOKIES}
    • + +
  • {L_THE_TEAM}
    • + diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html index ea4cc76171..cfce7d60a6 100644 --- a/phpBB/styles/subsilver2/template/index_body.html +++ b/phpBB/styles/subsilver2/template/index_body.html @@ -15,7 +15,7 @@ -{L_DELETE_COOKIES} | {L_THE_TEAM}
    +{L_DELETE_COOKIES} | {L_THE_TEAM}

    From 600ab46a93396b101b4b98ac2b24017e61460dd6 Mon Sep 17 00:00:00 2001 From: Crizzo Date: Tue, 22 Apr 2014 22:06:31 +0200 Subject: [PATCH 3/4] [ticket/12404] Changes append/prepend to after/before PHPBB3-12404 --- phpBB/docs/events.md | 12 ++++++------ phpBB/styles/prosilver/template/navbar_footer.html | 8 ++++---- phpBB/styles/subsilver2/template/breadcrumbs.html | 4 ++-- phpBB/styles/subsilver2/template/index_body.html | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/phpBB/docs/events.md b/phpBB/docs/events.md index 2b87d0a4aa..788e14a16b 100644 --- a/phpBB/docs/events.md +++ b/phpBB/docs/events.md @@ -275,7 +275,7 @@ overall_footer_page_body_after * Since: 3.1.0-b3 * Purpose: Add content after the page-body, but before the footer -overall_footer_teamlink_append +overall_footer_teamlink_after === * Locations: + styles/prosilver/template/navbar_footer.html @@ -283,7 +283,7 @@ overall_footer_teamlink_append * Since: 3.1.0-b3 * Purpose: Add contents after the team-link in the footer -overall_footer_teamlink_prepend +overall_footer_teamlink_before === * Locations: + styles/prosilver/template/navbar_footer.html @@ -291,21 +291,21 @@ overall_footer_teamlink_prepend * Since: 3.1.0-b3 * Purpose: Add contents before the team-link in the footer -overall_footer_timezone_append +overall_footer_timezone_after === * Locations: + styles/prosilver/template/navbar_footer.html + styles/subsilver2/template/breadcrumbs.html * Since: 3.1.0-b3 -* Purpose: Add content (must be inner
  • ) to the navbar in the page footer, after "Timezone" +* Purpose: Add content to the navbar in the page footer, after "Timezone" -overall_footer_timezone_prepend +overall_footer_timezone_before === * Locations: + styles/prosilver/template/navbar_footer.html + styles/subsilver2/template/breadcrumbs.html * Since: 3.1.0-b3 -* Purpose: Add content(must be inner
  • ) to the navbar in the page footer, before "Timezone" +* Purpose: Add content to the navbar in the page footer, before "Timezone" overall_header_body_before === diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html index 127c41558e..03d9f70924 100644 --- a/phpBB/styles/prosilver/template/navbar_footer.html +++ b/phpBB/styles/prosilver/template/navbar_footer.html @@ -8,13 +8,13 @@
  • {S_WATCH_FORUM_TITLE}
    • - +
  • {S_TIMEZONE}
    • - +
  • {L_DELETE_COOKIES}
    • - +
  • {L_THE_TEAM}
    • - + diff --git a/phpBB/styles/subsilver2/template/breadcrumbs.html b/phpBB/styles/subsilver2/template/breadcrumbs.html index 55f8c70a9c..47cb82c790 100644 --- a/phpBB/styles/subsilver2/template/breadcrumbs.html +++ b/phpBB/styles/subsilver2/template/breadcrumbs.html @@ -4,9 +4,9 @@

    {L_SITE_HOME} » {L_INDEX} » {navlinks.FORUM_NAME}

    - +

    {S_TIMEZONE}

    - + diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html index cfce7d60a6..a6310f4758 100644 --- a/phpBB/styles/subsilver2/template/index_body.html +++ b/phpBB/styles/subsilver2/template/index_body.html @@ -15,7 +15,7 @@ -{L_DELETE_COOKIES} | {L_THE_TEAM}
    +{L_DELETE_COOKIES} | {L_THE_TEAM}

    From df47cbb25468f84d4f792e4c3b836924b416a227 Mon Sep 17 00:00:00 2001 From: Crizzo Date: Fri, 25 Apr 2014 22:15:13 +0200 Subject: [PATCH 4/4] [ticket/12404] Splits up the line 18 in subsilver2 into more lines PHPBB3-12404 --- phpBB/styles/subsilver2/template/index_body.html | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html index a6310f4758..9e859eac0e 100644 --- a/phpBB/styles/subsilver2/template/index_body.html +++ b/phpBB/styles/subsilver2/template/index_body.html @@ -15,7 +15,14 @@ -{L_DELETE_COOKIES} | {L_THE_TEAM}
    + + {L_DELETE_COOKIES} + | + + {L_THE_TEAM} + + +