diff options
| author | friendica <info@friendica.com> | 2012-01-22 13:32:54 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-01-22 13:32:54 -0800 |
| commit | cf7e56aacb3fb0df60de7f9a67f987145721d46b (patch) | |
| tree | 91f5f9927d4d665f765c6fc788e79af94a5e5689 | |
| parent | 9f0a836674081d1ab7f2769a2f3f5b1245961690 (diff) | |
| parent | f1e4585c661d369bb0f2c208cfe19bbe0c1f68a0 (diff) | |
| download | volse-hubzilla-cf7e56aacb3fb0df60de7f9a67f987145721d46b.tar.gz volse-hubzilla-cf7e56aacb3fb0df60de7f9a67f987145721d46b.tar.bz2 volse-hubzilla-cf7e56aacb3fb0df60de7f9a67f987145721d46b.zip | |
Merge branch 'pull'
| -rwxr-xr-x | include/nav.php | 1 | ||||
| -rwxr-xr-x | mod/ping.php | 2 | ||||
| -rwxr-xr-x | view/nav.tpl | 2 | ||||
| -rwxr-xr-x | view/theme/testbubble/nav.tpl | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/include/nav.php b/include/nav.php index 4c75a495b..36a3edd2a 100755 --- a/include/nav.php +++ b/include/nav.php @@ -116,6 +116,7 @@ function nav(&$a) { if($_SESSION['page_flags'] == PAGE_NORMAL) { $nav['introductions'] = array('notifications/intros', t('Introductions'), "", t('Friend Requests')); $nav['notifications'] = array('notifications', t('Notifications'), "", t('Notifications')); + $nav['notifications_all']=array('notifications/network', t('See all notifications', "", "")); } diff --git a/mod/ping.php b/mod/ping.php index 35f6c53ae..db68332bd 100755 --- a/mod/ping.php +++ b/mod/ping.php @@ -145,7 +145,7 @@ function ping_init(&$a) { echo ' <notif count="'.$tot.'">'; if ($intro>0){ foreach ($intros as $i) { - echo xmlize( $a->get_baseurl().'/notifications/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend") ); + echo xmlize( $a->get_baseurl().'/notifications/intros/'.$i['id'], $i['name'], $i['url'], $i['photo'], relative_date($i['datetime']), t("{0} wants to be your friend") ); }; } if ($mail>0){ diff --git a/view/nav.tpl b/view/nav.tpl index d9255d86c..9831260b3 100755 --- a/view/nav.tpl +++ b/view/nav.tpl @@ -43,7 +43,7 @@ <li id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a> <span id="notify-update" class="nav-notify"></span> <ul id="nav-notifications-menu" class="menu-popup"> - <li id="nav-notifications-see-all"><a href="/notifications/network">See all notifications</a></li> + <li id="nav-notifications-see-all"><a href="$nav.notifications_all.0">$nav.notifications_all.1</a></li> <li class="empty">$emptynotifications</li> </ul> </li> diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl index c7d616826..bb4da22cb 100755 --- a/view/theme/testbubble/nav.tpl +++ b/view/theme/testbubble/nav.tpl @@ -9,7 +9,7 @@ {{ if $nav.notifications }}<a rel="#nav-notifications-menu" id="intro-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }} {{ if $nav.messages }}<a rel="#nav-notifications-menu" id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }} <ul id="nav-notifications-menu" class="menu-popup"> - <li id="nav-notifications-see-all"><a href="/notifications/network">See all notifications</a></li> + <li id="nav-notifications-see-all"><a href="$nav.notifications_all.0">$nav.notifications_all.1</a></li> <li class="empty">$emptynotifications</li> </ul> </div> |