diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2014-05-01 22:24:31 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2014-05-01 22:24:31 -0500 |
| commit | 73b950d2f191eb5590c43df6c555f1f217b3b2ee (patch) | |
| tree | 28cb3e67c02c44a336f21345536d1284c599827c /phpBB/styles | |
| parent | 4f393ad0968e03085d19e8c7f71c755c9231918b (diff) | |
| parent | df47cbb25468f84d4f792e4c3b836924b416a227 (diff) | |
| download | forums-73b950d2f191eb5590c43df6c555f1f217b3b2ee.tar forums-73b950d2f191eb5590c43df6c555f1f217b3b2ee.tar.gz forums-73b950d2f191eb5590c43df6c555f1f217b3b2ee.tar.bz2 forums-73b950d2f191eb5590c43df6c555f1f217b3b2ee.tar.xz forums-73b950d2f191eb5590c43df6c555f1f217b3b2ee.zip | |
Merge remote-tracking branch 'remotes/Crizz0/ticket/12404' into develop-ascraeus
# By Crizzo
# Via Crizzo
* remotes/Crizz0/ticket/12404:
[ticket/12404] Splits up the line 18 in subsilver2 into more lines
[ticket/12404] Changes append/prepend to after/before
[ticket/12404] Adds two new events and changes some places
[ticket/12404] Adds a new event before and after the Timezone display
Diffstat (limited to 'phpBB/styles')
| -rw-r--r-- | phpBB/styles/prosilver/template/navbar_footer.html | 6 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/breadcrumbs.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/index_body.html | 9 |
3 files changed, 15 insertions, 2 deletions
diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html index 0bc67a4417..13e50dae19 100644 --- a/phpBB/styles/prosilver/template/navbar_footer.html +++ b/phpBB/styles/prosilver/template/navbar_footer.html @@ -10,9 +10,13 @@ <!-- IF not S_IS_BOT --> <!-- IF U_WATCH_FORUM_LINK --><li class="small-icon icon-<!-- IF S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->"><a href="{U_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_FORUM -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_FORUM_TOGGLE}" data-toggle-url="{U_WATCH_FORUM_TOGGLE}">{S_WATCH_FORUM_TITLE}</a></li><!-- ENDIF --> <!-- ENDIF --> + <!-- EVENT overall_footer_timezone_before --> <li class="rightside">{S_TIMEZONE}</li> + <!-- EVENT overall_footer_timezone_after --> <!-- IF not S_IS_BOT --><li class="rightside"><a href="{U_DELETE_COOKIES}" data-ajax="true" data-refresh="true">{L_DELETE_COOKIES}</a></li><!-- ENDIF --> - <!-- IF U_TEAM --><li class="rightside"><a href="{U_TEAM}">{L_THE_TEAM}</a><!-- ENDIF --> + <!-- EVENT overall_footer_teamlink_before --> + <!-- IF U_TEAM --><li class="rightside"><a href="{U_TEAM}">{L_THE_TEAM}</a></li><!-- ENDIF --> + <!-- EVENT overall_footer_teamlink_after --> </ul> </div> diff --git a/phpBB/styles/subsilver2/template/breadcrumbs.html b/phpBB/styles/subsilver2/template/breadcrumbs.html index 09ee9a8606..47cb82c790 100644 --- a/phpBB/styles/subsilver2/template/breadcrumbs.html +++ b/phpBB/styles/subsilver2/template/breadcrumbs.html @@ -4,7 +4,9 @@ <td class="row1"> <p class="breadcrumbs"><!-- IF U_SITE_HOME --><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a> <strong>»</strong> <!-- ENDIF --><a href="{U_INDEX}"{$MICRODATA}>{L_INDEX}</a><!-- BEGIN navlinks --> » <a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a><!-- END navlinks --> <!-- EVENT overall_header_breadcrumb_append --></p> + <!-- EVENT overall_footer_timezone_before --> <p class="datetime">{S_TIMEZONE}</p> + <!-- EVENT overall_footer_timezone_after --> </td> </tr> </table> diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html index ea4cc76171..9e859eac0e 100644 --- a/phpBB/styles/subsilver2/template/index_body.html +++ b/phpBB/styles/subsilver2/template/index_body.html @@ -15,7 +15,14 @@ <!-- INCLUDE forumlist_body.html --> <!-- IF not S_IS_BOT or U_TEAM --> -<span class="gensmall"><!-- IF not S_IS_BOT --><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a><!-- ENDIF --><!-- IF not S_IS_BOT and U_TEAM --> | <!-- ENDIF --><!-- IF U_TEAM --><a href="{U_TEAM}">{L_THE_TEAM}</a><!-- ENDIF --></span><br /> +<span class="gensmall"> + <!-- IF not S_IS_BOT --><a href="{U_DELETE_COOKIES}">{L_DELETE_COOKIES}</a><!-- ENDIF --> + <!-- IF not S_IS_BOT and U_TEAM --> | <!-- ENDIF --> + <!-- EVENT overall_footer_teamlink_before --> + <!-- IF U_TEAM --><a href="{U_TEAM}">{L_THE_TEAM}</a><!-- ENDIF --> + <!-- EVENT overall_footer_teamlink_after --> +</span> +<br /> <!-- ENDIF --> <br clear="all" /> |