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

more work on nav-modal

Browse Source
This commit is contained in:
zotlabs 2017-02-03 15:31:01 -08:00
parent f79a11cbf7
commit fc4083346e
4 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
include/nav.php
View File

@ -76,6 +76,20 @@ EOT;
$userinfo = null; $userinfo = null;
$nav['loginmenu']=array(); $nav['loginmenu']=array();
if($observer) {
$userinfo = array(
'icon' => $observer['xchan_photo_m'],
'name' => $observer['xchan_addr'],
);
}
elseif(! $_SESSION['authenticated']) {
$nav['remote_login'] = remote_login();
$nav['loginmenu'][] = Array('rmagic',t('Remote authentication'),'',t('Click to authenticate to your home hub'),'rmagic_nav_btn');
}
if(local_channel()) { if(local_channel()) {
@ -114,6 +128,13 @@ EOT;
if(! get_account_id()) { if(! get_account_id()) {
$nav['login'] = login(true,'main-login',false,false); $nav['login'] = login(true,'main-login',false,false);
$nav['loginmenu'][] = Array('login',t('Login'),'',t('Sign in'),'login_nav_btn'); $nav['loginmenu'][] = Array('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'] = Array('logout',t('Logout'), "", t('End this session'),'logout_nav_btn'); $nav['alogout'] = Array('logout',t('Logout'), "", t('End this session'),'logout_nav_btn');
@ -121,17 +142,6 @@ EOT;
} }
if($observer) {
$userinfo = array(
'icon' => $observer['xchan_photo_m'],
'name' => $observer['xchan_addr'],
);
}
elseif(! $_SESSION['authenticated']) {
$nav['remote_login'] = remote_login();
$nav['loginmenu'][] = Array('rmagic',t('Remote authentication'),'',t('Click to authenticate to your home hub'),'rmagic_nav_btn');
}
$homelink = get_my_url(); $homelink = get_my_url();
if(! $homelink) { if(! $homelink) {

3
view/theme/redbasic/css/style.css
View File

@ -2109,4 +2109,7 @@ dl.bb-dl > dd > li {
#nav-login { #nav-login {
padding: 10px; padding: 10px;
min-width: 300px; min-width: 300px;
border: 1px solid #000;
background-color: #fff;
} }

20
view/tpl/nav.tpl
View File

@ -156,7 +156,7 @@
{{if $nav.login && !$userinfo}} {{if $nav.login && !$userinfo}}
<li class=""> <li class="">
<a href="#" title="{{$nav.loginmenu.0.3}}" id="{{$nav.loginmenu.0.4}}" data-toggle="modal" data-target="#nav-login">{{$nav.loginmenu.0.1}} <span class="caret" id="loginmenu-caret"></span></a> <a href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login">{{$nav.loginmenu.1.1}} <span class="caret" id="loginmenu-caret"></span></a>
</li> </li>
{{/if}} {{/if}}
@ -222,24 +222,6 @@
</div> </div>
</div> </div>
{{if $nav.login && !$userinfo}}
<div id="nav-login" class="modal" role="dialog">
<div class="modal-dialog">
<div class="modal-header"><h3>{{$nav.loginmenu.0.1}}</h3></div>
<div class="modal-body">
<div class="form-group">
{{$nav.login}}
{{$nav.remote_login}}
</div>
</div>
</div>
</div>
{{/if}}
{{if $nav.help.6}} {{if $nav.help.6}}
<div id="contextual-help-content" class="contextual-help-content"> <div id="contextual-help-content" class="contextual-help-content">
{{$nav.help.5}} {{$nav.help.5}}

13
view/tpl/nav_login.tpl Normal file
View File

@ -0,0 +1,13 @@
{{if $nav.login && !$userinfo}}
<div id="nav-login" class="modal" role="dialog">
<div class="modal-dialog">
<div class="modal-header"><h3>{{$nav.loginmenu.1.1}}</h3></div>
<div class="modal-body">
<div class="form-group">
{{$nav.login}}
{{$nav.remote_login}}
</div>
</div>
</div>
</div>
{{/if}}