diff options
| author | PayBas <contact@paybas.com> | 2014-06-13 15:24:06 +0200 |
|---|---|---|
| committer | PayBas <contact@paybas.com> | 2014-06-25 14:19:00 +0200 |
| commit | 5a00054f5213e92552241889d651836881efeece (patch) | |
| tree | cb8977dc5de35d803f7e938ebabc98243b26cad1 /phpBB/styles/prosilver | |
| parent | ac89c84808d7641dd99447b5058c642635dbb624 (diff) | |
| download | forums-5a00054f5213e92552241889d651836881efeece.tar forums-5a00054f5213e92552241889d651836881efeece.tar.gz forums-5a00054f5213e92552241889d651836881efeece.tar.bz2 forums-5a00054f5213e92552241889d651836881efeece.tar.xz forums-5a00054f5213e92552241889d651836881efeece.zip | |
[ticket/12662] Improve template checks
And changed _CLEAN to _SIMPLE, and move teamlink events
PHPBB3-12662
Diffstat (limited to 'phpBB/styles/prosilver')
| -rw-r--r-- | phpBB/styles/prosilver/template/index_body.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/navbar_footer.html | 10 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/navbar_header.html | 40 |
3 files changed, 23 insertions, 29 deletions
diff --git a/phpBB/styles/prosilver/template/index_body.html b/phpBB/styles/prosilver/template/index_body.html index ce2886111e..8d100074f8 100644 --- a/phpBB/styles/prosilver/template/index_body.html +++ b/phpBB/styles/prosilver/template/index_body.html @@ -5,7 +5,7 @@ <!-- EVENT index_body_linklist_before --> -<!-- IF not S_IS_BOT and U_MARK_FORUMS --> +<!-- IF U_MARK_FORUMS --> <ul class="linklist bulletin"> <li class="rightside mark-read"><a href="{U_MARK_FORUMS}" accesskey="m" data-ajax="mark_forums_read">{L_MARK_FORUMS_READ}</a></li> </ul> diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html index 7ddc3b6e00..e56b9e2978 100644 --- a/phpBB/styles/prosilver/template/navbar_footer.html +++ b/phpBB/styles/prosilver/template/navbar_footer.html @@ -15,15 +15,11 @@ <li class="rightside">{S_TIMEZONE}</li> <!-- EVENT overall_footer_timezone_after --> <!-- IF not S_IS_BOT --><li class="small-icon icon-delete-cookies rightside"><a href="{U_DELETE_COOKIES}" data-ajax="true" data-refresh="true" role="menuitem">{L_DELETE_COOKIES}</a></li><!-- ENDIF --> + <!-- IF S_REGISTERED_USER and S_DISPLAY_MEMBERLIST --><li class="small-icon icon-members rightside"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}" role="menuitem">{L_MEMBERLIST}</a></li><!-- ENDIF --> <!-- EVENT overall_footer_teamlink_before --> - - <!-- IF S_USER_LOGGED_IN and not S_IS_BOT --> - <!-- IF S_DISPLAY_MEMBERLIST --><li class="small-icon icon-members rightside"><a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}" role="menuitem">{L_MEMBERLIST}</a></li><!-- ENDIF --> - <!-- IF U_TEAM --><li class="small-icon icon-team rightside"><a href="{U_TEAM}" role="menuitem">{L_THE_TEAM}</a></li><!-- ENDIF --> - <!-- ENDIF --> - <!-- IF U_CONTACT_US --><li class="small-icon icon-contact rightside"><a href="{U_CONTACT_US}" role="menuitem">{L_CONTACT_US}</a></li><!-- ENDIF --> - + <!-- IF S_REGISTERED_USER and U_TEAM --><li class="small-icon icon-team rightside"><a href="{U_TEAM}" role="menuitem">{L_THE_TEAM}</a></li><!-- ENDIF --> <!-- EVENT overall_footer_teamlink_after --> + <!-- IF U_CONTACT_US --><li class="small-icon icon-contact rightside"><a href="{U_CONTACT_US}" role="menuitem">{L_CONTACT_US}</a></li><!-- ENDIF --> </ul> </div> diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html index b9d886d178..fbdaddfd48 100644 --- a/phpBB/styles/prosilver/template/navbar_header.html +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -9,39 +9,37 @@ <div class="pointer"><div class="pointer-inner"></div></div> <ul class="dropdown-contents" role="menu"> <!-- EVENT overall_header_quick_links_before --> - <li class="separator"></li> - <!-- IF S_USER_LOGGED_IN and not S_IS_BOT --> - <li class="small-icon icon-search-self"><a href="{U_SEARCH_SELF}" role="menuitem">{L_SEARCH_SELF}</a></li> - <!-- ENDIF --> - <li class="small-icon icon-search-unanswered"><a href="{U_SEARCH_UNANSWERED}" role="menuitem">{L_SEARCH_UNANSWERED}</a></li> - <!-- IF S_LOAD_UNREADS --> - <li class="small-icon icon-search-unread"><a href="{U_SEARCH_UNREAD}" role="menuitem">{L_SEARCH_UNREAD}</a></li> + <!-- IF S_DISPLAY_SEARCH --> + <li class="separator"></li> + <!-- IF S_REGISTERED_USER --> + <li class="small-icon icon-search-self"><a href="{U_SEARCH_SELF}" role="menuitem">{L_SEARCH_SELF}</a></li> + <!-- ENDIF --> + <li class="small-icon icon-search-unanswered"><a href="{U_SEARCH_UNANSWERED}" role="menuitem">{L_SEARCH_UNANSWERED}</a></li> + <!-- IF S_LOAD_UNREADS --> + <li class="small-icon icon-search-unread"><a href="{U_SEARCH_UNREAD}" role="menuitem">{L_SEARCH_UNREAD}</a></li> + <!-- ENDIF --> + <!-- IF S_USER_LOGGED_IN --> + <li class="small-icon icon-search-new"><a href="{U_SEARCH_NEW}" role="menuitem">{L_SEARCH_NEW}</a></li> + <!-- ENDIF --> + <li class="small-icon icon-search-active"><a href="{U_SEARCH_ACTIVE_TOPICS}" role="menuitem">{L_SEARCH_ACTIVE_TOPICS}</a></li> <!-- ENDIF --> - <!-- IF S_USER_LOGGED_IN --> - <li class="small-icon icon-search-new"><a href="{U_SEARCH_NEW}" role="menuitem">{L_SEARCH_NEW}</a></li> - <!-- ENDIF --> - <li class="small-icon icon-search-active"><a href="{U_SEARCH_ACTIVE_TOPICS}" role="menuitem">{L_SEARCH_ACTIVE_TOPICS}</a></li> - <li class="separator"></li> + <!-- EVENT overall_header_quick_links_after --> </ul> </div> </li> - <!-- IF S_REGISTERED_USER and U_ACP --> - <li class="small-icon icon-acp" data-skip-responsive="true"><a href="{U_ACP}" title="{L_ACP}" role="menuitem">{L_ACP_SHORT}</a></li> - <!-- ENDIF --> - <!-- IF S_REGISTERED_USER and U_MCP --> - <li class="small-icon icon-mcp" data-skip-responsive="true"><a href="{U_MCP}" title="{L_MCP}" role="menuitem">{L_MCP_SHORT}</a></li> - <!-- ENDIF --> + <!-- IF U_ACP --><li class="small-icon icon-acp" data-skip-responsive="true"><a href="{U_ACP}" title="{L_ACP}" role="menuitem">{L_ACP_SHORT}</a></li><!-- ENDIF --> + <!-- IF U_MCP --><li class="small-icon icon-mcp" data-skip-responsive="true"><a href="{U_MCP}" title="{L_MCP}" role="menuitem">{L_MCP_SHORT}</a></li><!-- ENDIF --> <!-- EVENT overall_header_navigation_prepend --> - <li class="small-icon icon-faq"<!-- IF not S_USER_LOGGED_IN and not S_IS_BOT --> data-skip-responsive="true"<!-- ENDIF -->><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}" role="menuitem">{L_FAQ}</a></li> + <li class="small-icon icon-faq"<!-- IF not S_USER_LOGGED_IN --> data-skip-responsive="true"<!-- ENDIF -->><a href="{U_FAQ}" title="{L_FAQ_EXPLAIN}" role="menuitem">{L_FAQ}</a></li> <!-- EVENT overall_header_navigation_append --> - <!-- IF S_USER_LOGGED_IN and not S_IS_BOT --> + <!-- IF S_REGISTERED_USER --> <li id="username_logged_in" class="rightside dropdown-container<!-- IF CURRENT_USER_AVATAR --> no-bulletin<!-- ENDIF -->" data-skip-responsive="true"> - <a href="{U_PROFILE}" class="header-avatar dropdown-trigger"><!-- IF CURRENT_USER_AVATAR -->{CURRENT_USER_AVATAR} <!-- ENDIF -->{CURRENT_USERNAME_CLEAN}</a> + <a href="{U_PROFILE}" class="header-avatar dropdown-trigger"><!-- IF CURRENT_USER_AVATAR -->{CURRENT_USER_AVATAR} <!-- ENDIF -->{CURRENT_USERNAME_SIMPLE}</a> <div class="dropdown hidden"> <div class="pointer"><div class="pointer-inner"></div></div> <ul class="dropdown-contents" role="menu"> |