diff options
| author | friendica <info@friendica.com> | 2014-06-14 15:13:53 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-06-14 15:13:53 -0700 |
| commit | 794cded66e521cdc581e00e4c432694c3117cfed (patch) | |
| tree | 5b0e95e8b7acd2c76e6f3d5b88962230fd7c0bc2 /include | |
| parent | ca78adb0c04dce985dd6752f03acce75811167dc (diff) | |
| parent | c97aa4504e71140a342cc48b1d7ff81842cb108b (diff) | |
| download | volse-hubzilla-794cded66e521cdc581e00e4c432694c3117cfed.tar.gz volse-hubzilla-794cded66e521cdc581e00e4c432694c3117cfed.tar.bz2 volse-hubzilla-794cded66e521cdc581e00e4c432694c3117cfed.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 24 | ||||
| -rw-r--r-- | include/nav.php | 10 |
2 files changed, 15 insertions, 19 deletions
diff --git a/include/conversation.php b/include/conversation.php index 21ce3bb66..ee4952d7e 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1517,25 +1517,17 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){ require_once('include/chat.php'); $chats = chatroom_list($uid); - $subdued = ((count($chats)) ? '' : ' subdued'); - $tabs[] = array( - 'label' => t('Chatrooms'), - 'url' => $a->get_baseurl() . '/chat/' . $nickname, - 'sel' => ((argv(0) == 'chat') ? 'active' . $subdued : '' . $subdued), - 'title' => t('Chatrooms'), - 'id' => 'chat-tab', - ); - - - if($is_owner) { + if (count($chats)) { $tabs[] = array( - 'label' => t('Events'), - 'url' => $a->get_baseurl() . '/events', - 'sel' => ((argv(0) == 'events') ? 'active' : ''), - 'title' => t('Events and Calendar'), - 'id' => 'events-tab', + 'label' => t('Chatrooms'), + 'url' => $a->get_baseurl() . '/chat/' . $nickname, + 'sel' => ((argv(0) == 'chat') ? 'active' : '' ), + 'title' => t('Chatrooms'), + 'id' => 'chat-tab', ); + } + if($is_owner) { $tabs[] = array( 'label' => t('Bookmarks'), 'url' => $a->get_baseurl() . '/bookmarks', diff --git a/include/nav.php b/include/nav.php index 2d0d43d5a..80e4955e5 100644 --- a/include/nav.php +++ b/include/nav.php @@ -83,8 +83,13 @@ EOT; $nav['usermenu'][] = Array('profiles', t('Edit Profiles'),"", t('Manage/Edit profiles')); $nav['usermenu'][] = Array('photos/' . $channel['channel_address'], t('Photos'), "", t('Your photos')); $nav['usermenu'][] = Array('cloud/' . $channel['channel_address'],t('Files'),"",t('Your files')); - $nav['usermenu'][] = Array('chat/' . $channel['channel_address'],t('Chat'),"",t('Your chatrooms')); - $nav['usermenu'][] = Array('events', t('Events'), "", t('Your events')); + + require_once('include/chat.php'); + $chats = chatroom_list(local_user()); + if (count($chats)) { + $nav['usermenu'][] = Array('chat/' . $channel['channel_address'],t('Chat'),"",t('Your chatrooms')); + } + $nav['usermenu'][] = Array('bookmarks', t('Bookmarks'), "", t('Your bookmarks')); if(feature_enabled($channel['channel_id'],'webpages')) $nav['usermenu'][] = Array('webpages/' . $channel['channel_address'],t('Webpages'),"",t('Your webpages')); @@ -185,7 +190,6 @@ EOT; $nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings')); - $nav['contacts'] = array('connections', t('Connections'),"", t('Manage/Edit Friends and Connections')); } /** |