move the remote user homebutton to the user menu. this way everything remote user related is in one place.
This commit is contained in:
parent
f4f3769225
commit
9d1443bbfe
@ -127,26 +127,24 @@ EOT;
|
||||
);
|
||||
}
|
||||
|
||||
if($observer) {
|
||||
$nav['lock'] = array('logout','','lock',
|
||||
sprintf( t('%s - click to logout'), $observer['xchan_addr']));
|
||||
}
|
||||
elseif(! $_SESSION['authenticated']) {
|
||||
$nav['loginmenu'][] = Array('rmagic',t('Remote authentication'),'',t('Click to authenticate to your home hub'),'rmagic_nav_btn');
|
||||
}
|
||||
|
||||
/**
|
||||
* "Home" should also take you home from an authenticated remote profile connection
|
||||
*/
|
||||
|
||||
$homelink = get_my_url();
|
||||
if(! $homelink) {
|
||||
$observer = App::get_observer();
|
||||
$homelink = (($observer) ? $observer['xchan_url'] : '');
|
||||
}
|
||||
|
||||
if(! local_channel())
|
||||
$nav['home'] = array($homelink, t('Home'), "", t('Home Page'),'home_nav_btn');
|
||||
if(! local_channel()) {
|
||||
$nav['rusermenu'] = array(
|
||||
$homelink,
|
||||
t('Get me home'),
|
||||
'logout',
|
||||
t('Log me out of this site')
|
||||
);
|
||||
}
|
||||
|
||||
if(((get_config('system','register_policy') == REGISTER_OPEN) || (get_config('system','register_policy') == REGISTER_APPROVE)) && (! $_SESSION['authenticated']))
|
||||
$nav['register'] = array('register',t('Register'), "", t('Create an account'),'register_nav_btn');
|
||||
|
@ -45,9 +45,10 @@
|
||||
{{/if}}
|
||||
</ul>
|
||||
{{else}}
|
||||
{{if $nav.lock}}
|
||||
{{if $nav.rusermenu}}
|
||||
<ul class="dropdown-menu" role="menu" aria-labelledby="avatar">
|
||||
<li role="presentation"><a href="{{$nav.lock.0}}" title="{{$nav.lock.3}}" role="menuitem">{{$nav.lock.3}}</a></li>
|
||||
<li role="presentation"><a href="{{$nav.rusermenu.0}}" role="menuitem">{{$nav.rusermenu.1}}</a></li>
|
||||
<li role="presentation"><a href="{{$nav.rusermenu.2}}" role="menuitem">{{$nav.rusermenu.3}}</a></li>
|
||||
</ul>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
Reference in New Issue
Block a user