diff options
| author | zotlabs <mike@macgirvin.com> | 2017-10-14 01:17:47 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-10-14 01:17:47 -0700 |
| commit | 9b94ad2ffe9abd34d2fd756b2366121ef89f376a (patch) | |
| tree | 7d791357e1ba29c4432aa8cde40ddb4c18363115 /view | |
| parent | 70b39e829bfb972f4a247b1a28a00d9d6a96d60c (diff) | |
| download | volse-hubzilla-9b94ad2ffe9abd34d2fd756b2366121ef89f376a.tar.gz volse-hubzilla-9b94ad2ffe9abd34d2fd756b2366121ef89f376a.tar.bz2 volse-hubzilla-9b94ad2ffe9abd34d2fd756b2366121ef89f376a.zip | |
was unable to make the modal login dialog work on the channel page with a cover photo. So for mod_channel, send login to the login page instead of the modal popup.
Diffstat (limited to 'view')
| -rwxr-xr-x | view/tpl/navbar_default.tpl | 16 | ||||
| -rwxr-xr-x | view/tpl/navbar_tucson.tpl | 16 |
2 files changed, 30 insertions, 2 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}} diff --git a/view/tpl/navbar_tucson.tpl b/view/tpl/navbar_tucson.tpl index acbe75876..602e0b988 100755 --- a/view/tpl/navbar_tucson.tpl +++ b/view/tpl/navbar_tucson.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}} @@ -178,7 +184,15 @@ {{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}} |