diff options
| author | habeascodice <habeascodice@federated.social> | 2014-11-01 03:04:11 -0700 |
|---|---|---|
| committer | habeascodice <habeascodice@federated.social> | 2014-11-01 03:04:11 -0700 |
| commit | 31376de0665091f2dba04755562ccd238d57a13c (patch) | |
| tree | ae59c8697b9fd20c33aeaf8acb3a698b63e9657b /view/tpl/nav.tpl | |
| parent | c854f8c238da2df08b52249142ad24ef66e422d1 (diff) | |
| parent | 50c16c394fe2d966c62d30930600212a4e33303e (diff) | |
| download | volse-hubzilla-31376de0665091f2dba04755562ccd238d57a13c.tar.gz volse-hubzilla-31376de0665091f2dba04755562ccd238d57a13c.tar.bz2 volse-hubzilla-31376de0665091f2dba04755562ccd238d57a13c.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/tpl/nav.tpl')
| -rwxr-xr-x | view/tpl/nav.tpl | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 6c461f062..a8a7a7da7 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -47,15 +47,22 @@ </div> <div class="collapse navbar-collapse" id="navbar-collapse-1"> <ul class="nav navbar-nav navbar-left"> + {{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}} {{if !$userinfo}} - {{if $nav.lock}} - <li> - <a title="{{$nav.lock.3}}" href="{{$nav.lock.0}}"><i class="{{if $nav.locked}}icon-lock{{else}}icon-unlock{{/if}}"></i></a> - </li> - {{/if}} + {{if $nav.loginmenu}} + <li class="{{$nav.loginmenu.0.2}} hidden-xs"> + <a data-toggle="dropdown" data-target="#" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" >{{$nav.loginmenu.0.1}} <span class="caret" id="usermenu-caret"></span></a> + <ul class="dropdown-menu" role="menu"> + {{foreach $nav.loginmenu as $loginmenu}} + <li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li> + {{/foreach}} + </ul> + </li> + {{foreach $nav.loginmenu as $loginmenu}} + <li role="presentation"><a class="{{$loginmenu.2}} visible-xs" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li> + {{/foreach}} + {{/if}} {{/if}} - - {{if $nav.login}}<li class="{{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}} {{if $nav.alogout}}<li class="{{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" >{{$nav.alogout.1}}</a></li>{{/if}} @@ -91,7 +98,6 @@ </li> {{/if}} - {{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}} {{if $nav.messages}} <li class="{{$sel.messages}} hidden-xs"> |