aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-06-15 08:09:26 +1000
committerRedMatrix <info@friendica.com>2014-06-15 08:09:26 +1000
commitc97aa4504e71140a342cc48b1d7ff81842cb108b (patch)
tree0c7b98991e48b84501e8689cae1e94e86ee30c67
parent9ac236d57dc027f6409d7dfcb1992807a1e08ead (diff)
parentc80cf61a9b91b7c235786b262828007b5855b999 (diff)
downloadvolse-hubzilla-c97aa4504e71140a342cc48b1d7ff81842cb108b.tar.gz
volse-hubzilla-c97aa4504e71140a342cc48b1d7ff81842cb108b.tar.bz2
volse-hubzilla-c97aa4504e71140a342cc48b1d7ff81842cb108b.zip
Merge pull request #494 from git-marijus/master
unclutter menus a little
-rw-r--r--include/conversation.php24
-rw-r--r--include/nav.php10
-rw-r--r--mod/connections.php1
-rw-r--r--mod/editwebpage.php1
-rwxr-xr-xview/tpl/nav.tpl7
5 files changed, 21 insertions, 22 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'));
}
/**
diff --git a/mod/connections.php b/mod/connections.php
index 3c3a704b2..b9df3c2b7 100644
--- a/mod/connections.php
+++ b/mod/connections.php
@@ -233,6 +233,7 @@ function connections_content(&$a) {
$a->argc = 1;
unset($a->argv[1]);
}
+ nav_set_selected('intros');
break;
case 'unconnected':
$search_flags = ABOOK_FLAG_UNCONNECTED;
diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index 38aef4a8b..deaf9ae57 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -169,7 +169,6 @@ function editwebpage_content(&$a) {
'$placeholdercategory' => t('Categories (comma-separated list)'),
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
'lockstate' => (((strlen($itm[0]['allow_cid'])) || (strlen($itm[0]['allow_gid'])) || (strlen($itm[0]['deny_cid'])) || (strlen($itm[0]['deny_gid']))) ? 'lock' : 'unlock'),
- '$acl' => populate_acl($itm[0]),
'$bang' => '',
'$profile_uid' => (intval($owner)),
'$preview' => ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''),
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 6b76ff5b6..dd3f67f45 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -18,11 +18,14 @@
{{foreach $nav.usermenu as $usermenu}}
<li role="presentation"><a href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem">{{$usermenu.1}}</a></li>
{{/foreach}}
+ <li role="presentation" class="divider"></li>
{{if $nav.profiles}}<li role="presentation"><a href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem">{{$nav.profiles.1}}</a></li>{{/if}}
{{if $nav.manage}}<li role="presentation"><a href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem">{{$nav.manage.1}}</a></li>{{/if}}
- {{if $nav.contacts}}<li role="presentation"><a href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" role="menuitem">{{$nav.contacts.1}}</a></li>{{/if}}
{{if $nav.settings}}<li role="presentation"><a href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem">{{$nav.settings.1}}</a></li>{{/if}}
- {{if $nav.admin}}<li role="presentation"><a href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem">{{$nav.admin.1}}</a></li>{{/if}}
+ {{if $nav.admin}}
+ <li role="presentation" class="divider"></li>
+ <li role="presentation"><a href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem">{{$nav.admin.1}}</a></li>
+ {{/if}}
{{if $nav.logout}}
<li role="presentation" class="divider"></li>
<li role="presentation"><a href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem">{{$nav.logout.1}}</a></li>