diff options
| author | zotlabs <mike@macgirvin.com> | 2017-10-16 18:20:17 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-10-16 18:20:17 -0700 |
| commit | 9497c6c0f7470800a54b0c8f60467f675b32c5ed (patch) | |
| tree | 99092dcb6b503cf92633395325cdfb2f25cd299d /view/tpl/navbar_default.tpl | |
| parent | 4dd05dc4e88171fb2bcaacde8c0699f64f6bb7e5 (diff) | |
| parent | b8a9390f49bf69f3a982cb44e7dfab6e55e6e5d3 (diff) | |
| download | volse-hubzilla-9497c6c0f7470800a54b0c8f60467f675b32c5ed.tar.gz volse-hubzilla-9497c6c0f7470800a54b0c8f60467f675b32c5ed.tar.bz2 volse-hubzilla-9497c6c0f7470800a54b0c8f60467f675b32c5ed.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/tpl/navbar_default.tpl')
| -rwxr-xr-x | view/tpl/navbar_default.tpl | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index a3f61cd30..6e8463f46 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -1,8 +1,14 @@ {{if $nav.login && !$userinfo}} <div class="d-xl-none pt-1 pb-1"> + {{if $nav.loginmenu.1.4}} <a class="btn btn-primary btn-sm text-white" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login"> {{$nav.loginmenu.1.1}} </a> + {{else}} + <a class="btn btn-primary btn-sm text-white" href="login" title="{{$nav.loginmenu.1.3}}"> + {{$nav.loginmenu.1.1}} + </a> + {{/if}} {{if $nav.register}} <a class="btn btn-warning btn-sm text-dark" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" > {{$nav.register.1}} @@ -79,7 +85,15 @@ <ul class="navbar-nav mr-auto"> {{if $nav.login && !$userinfo}} <li class="nav-item d-none d-xl-flex"> - <a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">{{$nav.loginmenu.1.1}}</a> + {{if $nav.loginmenu.1.4}} + <a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login"> + {{$nav.loginmenu.1.1}} + </a> + {{else}} + <a class="nav-link" href="login" title="{{$nav.loginmenu.1.3}}"> + {{$nav.loginmenu.1.1}} + </a> + {{/if}} </li> {{/if}} {{if $nav.register}} |