diff --git a/boot.php b/boot.php
index 5f0898a537..6993282016 100644
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
ini_set('pcre.backtrack_limit', 250000);
-define ( 'FRIENDIKA_VERSION', '2.2.1039' );
+define ( 'FRIENDIKA_VERSION', '2.2.1040' );
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1075 );
diff --git a/include/Scrape.php b/include/Scrape.php
index 3599d7df3e..e0075d44d9 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -388,8 +388,8 @@ function probe_url($url) {
if($j) {
$network = NETWORK_ZOT;
$vcard = array(
- 'fn' => $j->name,
- 'nick' => $j->username,
+ 'fn' => $j->fullname,
+ 'nick' => $j->nickname,
'photo' => $j->photo
);
$profile = $j->url;
diff --git a/include/nav.php b/include/nav.php
index 3b15c2b8a9..b3e1aa8e88 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -30,7 +30,7 @@ function nav(&$a) {
$sitelocation = $myident . substr($a->get_baseurl(),strpos($a->get_baseurl(),'//') + 2 );
- // nav links: array of array('href', 'text', 'extra css classes')
+ // nav links: array of array('href', 'text', 'extra css classes', 'title')
$nav = Array();
/**
@@ -38,10 +38,10 @@ function nav(&$a) {
*/
if(local_user()) {
- $nav['logout'] = Array('logout',t('Logout'), "");
+ $nav['logout'] = Array('logout',t('Logout'), "", t('End this session'));
}
else {
- $nav['login'] = Array('login',t('Login'), ($a->module == 'login'?'nav-selected':''));
+ $nav['login'] = Array('login',t('Login'), ($a->module == 'login'?'nav-selected':''), t('Sign in'));
}
@@ -52,21 +52,21 @@ function nav(&$a) {
$homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : '');
if(($a->module != 'home') && (! (local_user())))
- $nav['home'] = array($homelink, t('Home'), "");
+ $nav['home'] = array($homelink, t('Home'), "", t('Home Page'));
if(($a->config['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user()))
- $nav['register'] = array('register',t('Register'), "");
+ $nav['register'] = array('register',t('Register'), "", t('Create an account'));
$help_url = $a->get_baseurl() . '/help';
if(! get_config('system','hide_help'))
- $nav['help'] = array($help_url, t('Help'), "");
+ $nav['help'] = array($help_url, t('Help'), "", t('Help and documentation'));
if($a->apps)
- $nav['apps'] = array('apps', t('Apps'), "");
+ $nav['apps'] = array('apps', t('Apps'), "", t('Addon applications, utilities, games'));
- $nav['search'] = array('search', t('Search'), "");
+ $nav['search'] = array('search', t('Search'), "", t('Search site content'));
$gdirpath = 'directory';
@@ -76,9 +76,9 @@ function nav(&$a) {
$gdirpath = $gdir;
}
elseif(! get_config('system','no_community_page'))
- $nav['community'] = array('community', t('Community'), "");
+ $nav['community'] = array('community', t('Community'), "", t('Conversations on this site'));
- $nav['directory'] = array($gdirpath, t('Directory'), "");
+ $nav['directory'] = array($gdirpath, t('Directory'), "", t('People directory'));
/**
*
@@ -88,33 +88,33 @@ function nav(&$a) {
if(local_user()) {
- $nav['network'] = array('network', t('Network'), "");
+ $nav['network'] = array('network', t('Network'), "", t('Conversations from my friends'));
- $nav['home'] = array('profile/' . $a->user['nickname'], t('Home'), "");
+ $nav['home'] = array('profile/' . $a->user['nickname'], t('Home'), "", t('My posts and conversations'));
/* only show friend requests for normal pages. Other page types have automatic friendship. */
if($_SESSION['page_flags'] == PAGE_NORMAL) {
- $nav['notifications'] = array('notifications', t('Notifications'), "");
+ $nav['notifications'] = array('notifications', t('Notifications'), "", t('Friend requests'));
}
- $nav['messages'] = array('message', t('Messages'), "");
+ $nav['messages'] = array('message', t('Messages'), "", t('Private mail'));
if(is_array($a->identities) && count($a->identities) > 1) {
- $nav['manage'] = array('manage', t('Manage'), "");
+ $nav['manage'] = array('manage', t('Manage'), "", t('Manage other pages'));
}
- $nav['settings'] = array('settings', t('Settings'),"");
- $nav['profiles'] = array('profiles', t('Profiles'),"");
- $nav['contacts'] = array('contacts', t('Contacts'),"");
+ $nav['settings'] = array('settings', t('Settings'),"", t('Account settings'));
+ $nav['profiles'] = array('profiles', t('Profiles'),"", t('Manage/edit profiles'));
+ $nav['contacts'] = array('contacts', t('Contacts'),"", t('Manage/edit friends and contacts'));
}
/**
* Admin page
*/
if (is_site_admin()){
- $nav['admin'] = array('admin/', t('Admin'), "");
+ $nav['admin'] = array('admin/', t('Admin'), "", t('Site setup and configuration'));
}
diff --git a/view/nav.tpl b/view/nav.tpl
index 008278dc4b..09a25ac837 100644
--- a/view/nav.tpl
+++ b/view/nav.tpl
@@ -2,48 +2,48 @@ $langselector
$sitelocation
-{{ if $nav.logout }}$nav.logout.1 {{ endif }}
-{{ if $nav.login }}$nav.login.1 {{ endif }}
+{{ if $nav.logout }}$nav.logout.1 {{ endif }}
+{{ if $nav.login }}$nav.login.1 {{ endif }}
-{{ if $nav.register }}$nav.register.1{{ endif }}
+{{ if $nav.register }}$nav.register.1{{ endif }}
-$nav.help.1
+$nav.help.1
-{{ if $nav.apps }}$nav.apps.1{{ endif }}
+{{ if $nav.apps }}$nav.apps.1{{ endif }}
-$nav.search.1
-$nav.directory.1
+$nav.search.1
+$nav.directory.1
-{{ if $nav.admin }}$nav.admin.1{{ endif }}
+{{ if $nav.admin }}$nav.admin.1{{ endif }}
{{ if $nav.network }}
-$nav.network.1
+$nav.network.1
{{ endif }}
{{ if $nav.home }}
-$nav.home.1
+$nav.home.1
{{ endif }}
{{ if $nav.community }}
-
+
{{ endif }}
{{ if $nav.notifications }}
-$nav.notifications.1
+$nav.notifications.1
{{ endif }}
{{ if $nav.messages }}
-$nav.messages.1
+$nav.messages.1
{{ endif }}
-{{ if $nav.manage }}$nav.manage.1{{ endif }}
+{{ if $nav.manage }}$nav.manage.1{{ endif }}
-{{ if $nav.settings }}$nav.settings.1{{ endif }}
-{{ if $nav.profiles }}$nav.profiles.1{{ endif }}
+{{ if $nav.settings }}$nav.settings.1{{ endif }}
+{{ if $nav.profiles }}$nav.profiles.1{{ endif }}
-{{ if $nav.contacts }}$nav.contacts.1{{ endif }}
+{{ if $nav.contacts }}$nav.contacts.1{{ endif }}
$banner