solve intro/notify naming issue by providing both or either, theme decides what to do
This commit is contained in:
parent
2206d894b3
commit
3ef7dcac4b
2 changed files with 6 additions and 3 deletions
|
@ -114,7 +114,9 @@ function nav(&$a) {
|
||||||
/* only show friend requests for normal pages. Other page types have automatic friendship. */
|
/* only show friend requests for normal pages. Other page types have automatic friendship. */
|
||||||
|
|
||||||
if($_SESSION['page_flags'] == PAGE_NORMAL) {
|
if($_SESSION['page_flags'] == PAGE_NORMAL) {
|
||||||
$nav['notifications'] = array('notifications/network', t('Notifications'), "", t('Notifications'));
|
$nav['introductions'] = array('notifications/intros', t('Introductions'), "", t('Friend Requests'));
|
||||||
|
$nav['notifications'] = array('notifications', t('Notifications'), "", t('Notifications'));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$nav['messages'] = array('message', t('Messages'), "", t('Private mail'));
|
$nav['messages'] = array('message', t('Messages'), "", t('Private mail'));
|
||||||
|
@ -175,6 +177,7 @@ function nav_set_selected($item){
|
||||||
'network' => null,
|
'network' => null,
|
||||||
'home' => null,
|
'home' => null,
|
||||||
'profiles' => null,
|
'profiles' => null,
|
||||||
|
'introductions' => null,
|
||||||
'notifications' => null,
|
'notifications' => null,
|
||||||
'messages' => null,
|
'messages' => null,
|
||||||
'directory' => null,
|
'directory' => null,
|
||||||
|
|
|
@ -30,8 +30,8 @@
|
||||||
{{ if $nav.community }}
|
{{ if $nav.community }}
|
||||||
<a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
|
<a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
|
||||||
{{ endif }}
|
{{ endif }}
|
||||||
{{ if $nav.notifications }}
|
{{ if $nav.introductions }}
|
||||||
<a id="nav-notify-link" class="nav-commlink $nav.notifications.2 $sel.notifications" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
|
<a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
|
||||||
<span id="intro-update" class="nav-ajax-left"></span>
|
<span id="intro-update" class="nav-ajax-left"></span>
|
||||||
{{ endif }}
|
{{ endif }}
|
||||||
{{ if $nav.messages }}
|
{{ if $nav.messages }}
|
||||||
|
|
Loading…
Reference in a new issue