diff options
| author | PayBas <contact@paybas.com> | 2014-06-24 11:44:37 +0200 |
|---|---|---|
| committer | PayBas <contact@paybas.com> | 2014-06-25 14:19:01 +0200 |
| commit | bd0110ae7990a8d804851ce8b37ec69db9cd5a18 (patch) | |
| tree | 117e6365d0a503c80fdbec6fd1ab75f1f61a4af9 | |
| parent | b8f8b884e7fba8ccf7929e8c69aca3c23b3badc6 (diff) | |
| download | forums-bd0110ae7990a8d804851ce8b37ec69db9cd5a18.tar forums-bd0110ae7990a8d804851ce8b37ec69db9cd5a18.tar.gz forums-bd0110ae7990a8d804851ce8b37ec69db9cd5a18.tar.bz2 forums-bd0110ae7990a8d804851ce8b37ec69db9cd5a18.tar.xz forums-bd0110ae7990a8d804851ce8b37ec69db9cd5a18.zip | |
[ticket/12662] Fix recently merged PR changes lost in rebase
PHPBB3-12662
| -rw-r--r-- | phpBB/styles/prosilver/template/navbar_header.html | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html index b42f894dde..eb1d1feb12 100644 --- a/phpBB/styles/prosilver/template/navbar_header.html +++ b/phpBB/styles/prosilver/template/navbar_header.html @@ -39,7 +39,9 @@ <!-- IF S_REGISTERED_USER --> <li id="username_logged_in" class="rightside dropdown-container<!-- IF CURRENT_USER_AVATAR --> no-bulletin<!-- ENDIF -->" data-skip-responsive="true"> + <!-- EVENT navbar_header_username_prepend --> <a href="{U_PROFILE}" class="header-avatar dropdown-trigger"><!-- IF CURRENT_USER_AVATAR -->{CURRENT_USER_AVATAR} <!-- ENDIF -->{CURRENT_USERNAME_SIMPLE}</a> + <!-- EVENT navbar_header_username_append --> <div class="dropdown hidden"> <div class="pointer"><div class="pointer-inner"></div></div> <ul class="dropdown-contents" role="menu"> @@ -68,24 +70,23 @@ <!-- INCLUDE notification_dropdown.html --> </li> <!-- ENDIF --> - <!-- ENDIF --> - - <!-- IF not S_USER_LOGGED_IN and not S_IS_BOT --> + <!-- ELSE --> <li class="small-icon icon-logout rightside" data-skip-responsive="true"><a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x" role="menuitem">{L_LOGIN_LOGOUT}</a></li> <!-- IF S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) --> <li class="small-icon icon-register rightside" data-skip-responsive="true"><a href="{U_REGISTER}" role="menuitem">{L_REGISTER}</a></li> <!-- ENDIF --> + <li id="logged_out" class="rightside"><!-- EVENT navbar_header_logged_out_content --></li> <!-- ENDIF --> </ul> <ul id="nav-breadcrumbs" class="linklist navlinks" role="menubar"> <!-- DEFINE $MICRODATA = ' itemtype="http://data-vocabulary.org/Breadcrumb" itemscope=""' --> <li class="small-icon icon-home breadcrumbs" role="navigation"> - <!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}"{$MICRODATA}>{L_SITE_HOME}</a></span><!-- ENDIF --> - <span class="crumb"><a href="{U_INDEX}" accesskey="h"{$MICRODATA}>{L_INDEX}</a></span> + <!-- IF U_SITE_HOME --><span class="crumb"><a href="{U_SITE_HOME}"{$MICRODATA} data-navbar-reference="home">{L_SITE_HOME}</a></span><!-- ENDIF --> + <span class="crumb"><a href="{U_INDEX}" accesskey="h"{$MICRODATA} data-navbar-reference="index">{L_INDEX}</a></span> <!-- BEGIN navlinks --> <!-- EVENT overall_header_navlink_prepend --> - <span class="crumb"><a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}>{navlinks.FORUM_NAME}</a></span> + <span class="crumb"><a href="{navlinks.U_VIEW_FORUM}"{$MICRODATA}<!-- IF navlinks.MICRODATA --> {navlinks.MICRODATA}<!-- ENDIF -->>{navlinks.FORUM_NAME}</a></span> <!-- EVENT overall_header_navlink_append --> <!-- END navlinks --> <!-- EVENT overall_header_breadcrumb_append --> |