aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php25
-rw-r--r--include/nav.php12
2 files changed, 18 insertions, 19 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 21ce3bb66..d78ee2710 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1517,25 +1517,18 @@ 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..d1ee5da9a 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -73,6 +73,8 @@ EOT;
$nav['usermenu']=array();
$userinfo = null;
+
+
if(local_user()) {
$nav['logout'] = Array('logout',t('Logout'), "", t('End this session'));
@@ -83,8 +85,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 +192,6 @@ EOT;
$nav['settings'] = array('settings', t('Settings'),"", t('Account/Channel Settings'));
- $nav['contacts'] = array('connections', t('Connections'),"", t('Manage/Edit Friends and Connections'));
}
/**