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

move the remote user homebutton to the user menu. this way everything remote user related is in one place.

Browse Source
This commit is contained in:
Mario Vavti 2016-11-20 15:38:36 +01:00
parent f4f3769225
commit 9d1443bbfe
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/nav.php
View File

@ -127,26 +127,24 @@ EOT;
); );
} }
if($observer) {
$nav['lock'] = array('logout','','lock',
sprintf( t('%s - click to logout'), $observer['xchan_addr']));
}
elseif(! $_SESSION['authenticated']) { elseif(! $_SESSION['authenticated']) {
$nav['loginmenu'][] = Array('rmagic',t('Remote authentication'),'',t('Click to authenticate to your home hub'),'rmagic_nav_btn'); $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(); $homelink = get_my_url();
if(! $homelink) { if(! $homelink) {
$observer = App::get_observer(); $observer = App::get_observer();
$homelink = (($observer) ? $observer['xchan_url'] : ''); $homelink = (($observer) ? $observer['xchan_url'] : '');
} }
if(! local_channel()) if(! local_channel()) {
$nav['home'] = array($homelink, t('Home'), "", t('Home Page'),'home_nav_btn'); $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'])) 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'); $nav['register'] = array('register',t('Register'), "", t('Create an account'),'register_nav_btn');

5
view/tpl/nav.tpl
View File

@ -45,9 +45,10 @@
{{/if}} {{/if}}
</ul> </ul>
{{else}} {{else}}
{{if $nav.lock}} {{if $nav.rusermenu}}
<ul class="dropdown-menu" role="menu" aria-labelledby="avatar"> <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> </ul>
{{/if}} {{/if}}
{{/if}} {{/if}}