diff options
| author | RedMatrix <info@friendica.com> | 2014-10-17 09:43:36 +1100 |
|---|---|---|
| committer | RedMatrix <info@friendica.com> | 2014-10-17 09:43:36 +1100 |
| commit | 8391e8b1a179b9bda9198e0eb54171b4b88eb5f0 (patch) | |
| tree | 80f107ca73a484c7dfad72432cda5b6b0d1e3460 /include | |
| parent | f290c4b1e4c13389bacfd736772ce40fe1961f08 (diff) | |
| parent | e425def2a2d81dc39e113a343eeab51764ce1163 (diff) | |
| download | volse-hubzilla-8391e8b1a179b9bda9198e0eb54171b4b88eb5f0.tar.gz volse-hubzilla-8391e8b1a179b9bda9198e0eb54171b4b88eb5f0.tar.bz2 volse-hubzilla-8391e8b1a179b9bda9198e0eb54171b4b88eb5f0.zip | |
Merge pull request #645 from pafcu/master
Turn login button into a menu
Diffstat (limited to 'include')
| -rw-r--r-- | include/nav.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/nav.php b/include/nav.php index 4f7d609aa..ba817648b 100644 --- a/include/nav.php +++ b/include/nav.php @@ -84,6 +84,7 @@ EOT; $nav['usermenu']=array(); $userinfo = null; + $nav['loginmenu']=array(); if(local_user()) { @@ -120,8 +121,9 @@ EOT; $nav['usermenu'][] = Array('webpages/' . $channel['channel_address'],t('Webpages'),"",t('Your webpages')); } else { - if(! get_account_id()) - $nav['login'] = Array('login',t('Login'), ($a->module == 'login'?'selected':''), t('Sign in')); + if(! get_account_id()) { + $nav['loginmenu'][] = Array('login',t('Login'),'',t('Sign in')); + } else $nav['alogout'] = Array('logout',t('Logout'), "", t('End this session')); @@ -136,14 +138,11 @@ EOT; } if($observer) { - $nav['locked'] = true; $nav['lock'] = array('logout','','lock', sprintf( t('%s - click to logout'), $observer['xchan_addr'])); } else { - $nav['locked'] = false; - $nav['lock'] = array('rmagic','','unlock', - t('Click to authenticate to your home hub')); + $nav['loginmenu'][] = Array('rmagic',t('Remote login'),'',t('Click to authenticate to your home hub')); } /** |