harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
zotlabs 2017-10-14 01:17:47 -07:00
parent 70b39e829b
commit 9b94ad2ffe
3 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/nav.php
View File

@ -148,15 +148,20 @@ EOT;
} }
else { else {
if(! get_account_id()) { if(! get_account_id()) {
$nav['login'] = login(true,'main-login',false,false); if(App::$module === 'channel') {
$nav['loginmenu'][] = ['login',t('Login'),'',t('Sign in'),'login_nav_btn']; $nav['login'] = login(true,'main-login',false,false);
App::$page['content'] .= replace_macros(get_markup_template('nav_login.tpl'), $nav['loginmenu'][] = ['login',t('Login'),'',t('Sign in'),''];
[ }
'$nav' => $nav, else {
'userinfo' => $userinfo $nav['login'] = login(true,'main-login',false,false);
] $nav['loginmenu'][] = ['login',t('Login'),'',t('Sign in'),'login_nav_btn'];
); App::$page['content'] .= replace_macros(get_markup_template('nav_login.tpl'),
[
'$nav' => $nav,
'userinfo' => $userinfo
]
);
}
} }
else else
$nav['alogout'] = ['logout',t('Logout'), "", t('End this session'),'logout_nav_btn']; $nav['alogout'] = ['logout',t('Logout'), "", t('End this session'),'logout_nav_btn'];

16
view/tpl/navbar_default.tpl
View File

@ -1,8 +1,14 @@
{{if $nav.login && !$userinfo}} {{if $nav.login && !$userinfo}}
<div class="d-xl-none pt-1 pb-1"> <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"> <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}} {{$nav.loginmenu.1.1}}
</a> </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}} {{if $nav.register}}
<a class="btn btn-warning btn-sm text-dark" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" > <a class="btn btn-warning btn-sm text-dark" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" >
{{$nav.register.1}} {{$nav.register.1}}
@ -79,7 +85,15 @@
<ul class="navbar-nav mr-auto"> <ul class="navbar-nav mr-auto">
{{if $nav.login && !$userinfo}} {{if $nav.login && !$userinfo}}
<li class="nav-item d-none d-xl-flex"> <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> </li>
{{/if}} {{/if}}
{{if $nav.register}} {{if $nav.register}}

16
view/tpl/navbar_tucson.tpl
View File

@ -1,8 +1,14 @@
{{if $nav.login && !$userinfo}} {{if $nav.login && !$userinfo}}
<div class="d-xl-none pt-1 pb-1"> <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"> <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}} {{$nav.loginmenu.1.1}}
</a> </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}} {{if $nav.register}}
<a class="btn btn-warning btn-sm text-dark" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" > <a class="btn btn-warning btn-sm text-dark" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" >
{{$nav.register.1}} {{$nav.register.1}}
@ -178,7 +184,15 @@
{{if $nav.login && !$userinfo}} {{if $nav.login && !$userinfo}}
<li class="nav-item d-none d-xl-flex"> <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> </li>
{{/if}} {{/if}}
{{if $nav.register}} {{if $nav.register}}