keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

link tips on nav bar

Browse source
This commit is contained in:
Friendika 2011-07-14 03:05:54 -07:00
parent 74a608e1c7
commit 7534b8873b
4 changed files with 39 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -4,7 +4,7 @@ set_time_limit(0);
ini_set('pcre.backtrack_limit', 250000); 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 ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1075 ); define ( 'DB_UPDATE_VERSION', 1075 );

4
include/Scrape.php
View file

@ -388,8 +388,8 @@ function probe_url($url) {
if($j) { if($j) {
$network = NETWORK_ZOT; $network = NETWORK_ZOT;
$vcard = array( $vcard = array(
'fn' => $j->name, 'fn' => $j->fullname,
'nick' => $j->username, 'nick' => $j->nickname,
'photo' => $j->photo 'photo' => $j->photo
); );
$profile = $j->url; $profile = $j->url;

38
include/nav.php
View file

@ -30,7 +30,7 @@ function nav(&$a) {
$sitelocation = $myident . substr($a->get_baseurl(),strpos($a->get_baseurl(),'//') + 2 ); $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(); $nav = Array();
/** /**
@ -38,10 +38,10 @@ function nav(&$a) {
*/ */
if(local_user()) { if(local_user()) {
$nav['logout'] = Array('logout',t('Logout'), ""); $nav['logout'] = Array('logout',t('Logout'), "", t('End this session'));
} }
else { 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'] : ''); $homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : '');
if(($a->module != 'home') && (! (local_user()))) 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())) 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'; $help_url = $a->get_baseurl() . '/help';
if(! get_config('system','hide_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) 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'; $gdirpath = 'directory';
@ -76,9 +76,9 @@ function nav(&$a) {
$gdirpath = $gdir; $gdirpath = $gdir;
} }
elseif(! get_config('system','no_community_page')) 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()) { 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. */ /* 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', 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) { 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['settings'] = array('settings', t('Settings'),"", t('Account settings'));
$nav['profiles'] = array('profiles', t('Profiles'),""); $nav['profiles'] = array('profiles', t('Profiles'),"", t('Manage/edit profiles'));
$nav['contacts'] = array('contacts', t('Contacts'),""); $nav['contacts'] = array('contacts', t('Contacts'),"", t('Manage/edit friends and contacts'));
} }
/** /**
* Admin page * Admin page
*/ */
if (is_site_admin()){ if (is_site_admin()){
$nav['admin'] = array('admin/', t('Admin'), ""); $nav['admin'] = array('admin/', t('Admin'), "", t('Site setup and configuration'));
} }

34
view/nav.tpl
View file

@ -2,48 +2,48 @@ $langselector
<div id="site-location">$sitelocation</div> <div id="site-location">$sitelocation</div>
{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a> {{ endif }} {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0">$nav.login.1</a> {{ endif }} {{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
<span id="nav-link-wrapper" > <span id="nav-link-wrapper" >
{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0">$nav.register.1</a>{{ endif }} {{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0">$nav.help.1</a> <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0">$nav.apps.1</a>{{ endif }} {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0">$nav.search.1</a> <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0">$nav.directory.1</a> <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0">$nav.admin.1</a>{{ endif }} {{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
{{ if $nav.network }} {{ if $nav.network }}
<a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0">$nav.network.1</a> <a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
<span id="net-update" class="nav-ajax-left"></span> <span id="net-update" class="nav-ajax-left"></span>
{{ endif }} {{ endif }}
{{ if $nav.home }} {{ if $nav.home }}
<a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0">$nav.home.1</a> <a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
<span id="home-update" class="nav-ajax-left"></span> <span id="home-update" class="nav-ajax-left"></span>
{{ endif }} {{ endif }}
{{ if $nav.community }} {{ if $nav.community }}
<a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0">$nav.community.1</a> <a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
{{ endif }} {{ endif }}
{{ if $nav.notifications }} {{ if $nav.notifications }}
<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0">$nav.notifications.1</a> <a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
<span id="notify-update" class="nav-ajax-left"></span> <span id="notify-update" class="nav-ajax-left"></span>
{{ endif }} {{ endif }}
{{ if $nav.messages }} {{ if $nav.messages }}
<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0">$nav.messages.1</a> <a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
<span id="mail-update" class="nav-ajax-left"></span> <span id="mail-update" class="nav-ajax-left"></span>
{{ endif }} {{ endif }}
{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0">$nav.manage.1</a>{{ endif }} {{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0">$nav.settings.1</a>{{ endif }} {{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0">$nav.profiles.1</a>{{ endif }} {{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
{{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0">$nav.contacts.1</a>{{ endif }} {{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
</span> </span>
<span id="nav-end"></span> <span id="nav-end"></span>
<span id="banner">$banner</span> <span id="banner">$banner</span>