wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extended profile - add nav link to new profile block

Browse Source
This commit is contained in:
Zach Copley 2011-03-16 10:30:57 -07:00
parent 0666c6f8b2
commit 3692a09095
3 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/accountprofileblock.php
View File

@ -4,7 +4,7 @@
* Copyright (C) 2011, StatusNet, Inc. * Copyright (C) 2011, StatusNet, Inc.
* *
* Profile block to show for an account * Profile block to show for an account
* *
* PHP version 5 * PHP version 5
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
@ -63,8 +63,8 @@ class AccountProfileBlock extends ProfileBlock
if (empty($avatar)) { if (empty($avatar)) {
$avatar = $this->profile->getAvatar(73); $avatar = $this->profile->getAvatar(73);
} }
return (!empty($avatar)) ? return (!empty($avatar)) ?
$avatar->displayUrl() : $avatar->displayUrl() :
Avatar::defaultImage(AVATAR_PROFILE_SIZE); Avatar::defaultImage(AVATAR_PROFILE_SIZE);
} }
@ -95,21 +95,22 @@ class AccountProfileBlock extends ProfileBlock
function showActions() function showActions()
{ {
if ($this->profile->hasRole(Profile_role::DELETED)) {
$this->out->elementStart('div', 'entity_actions');
// TRANS: H2 for user actions in a profile.
$this->out->element('h2', null, _('User actions'));
$this->out->elementStart('ul');
$this->out->elementStart('p', array('class' => 'profile_deleted'));
// TRANS: Text shown in user profile of not yet compeltely deleted users.
$this->out->text(_('User deletion in progress...'));
$this->out->elementEnd('p');
$this->out->elementEnd('ul');
$this->out->elementEnd('div');
return;
}
if (Event::handle('StartProfilePageActionsSection', array($this->out, $this->profile))) { if (Event::handle('StartProfilePageActionsSection', array($this->out, $this->profile))) {
if ($this->profile->hasRole(Profile_role::DELETED)) {
$this->out->elementStart('div', 'entity_actions');
// TRANS: H2 for user actions in a profile.
$this->out->element('h2', null, _('User actions'));
$this->out->elementStart('ul');
$this->out->elementStart('p', array('class' => 'profile_deleted'));
// TRANS: Text shown in user profile of not yet compeltely deleted users.
$this->out->text(_('User deletion in progress...'));
$this->out->elementEnd('p');
$this->out->elementEnd('ul');
$this->out->elementEnd('div');
return;
}
$cur = common_current_user(); $cur = common_current_user();
$this->out->elementStart('div', 'entity_actions'); $this->out->elementStart('div', 'entity_actions');

15
plugins/ExtendedProfile/ExtendedProfilePlugin.php
View File

@ -34,7 +34,7 @@ class ExtendedProfilePlugin extends Plugin
{ {
$versions[] = array('name' => 'ExtendedProfile', $versions[] = array('name' => 'ExtendedProfile',
'version' => STATUSNET_VERSION, 'version' => STATUSNET_VERSION,
'author' => 'Brion Vibber', 'author' => 'Brion Vibber, Zach Copley',
'homepage' => 'http://status.net/wiki/Plugin:ExtendedProfile', 'homepage' => 'http://status.net/wiki/Plugin:ExtendedProfile',
'rawdescription' => 'rawdescription' =>
_m('UI extensions for additional profile fields.')); _m('UI extensions for additional profile fields.'));
@ -110,22 +110,13 @@ class ExtendedProfilePlugin extends Plugin
return true; return true;
} }
function onEndAccountSettingsProfileMenuItem($widget, $menu) function onStartProfilePageActionsSection(HTMLOutputter $out, Profile $profile) {
{
// TRANS: Link title attribute in user account settings menu.
$title = _('Change additional profile settings');
// TRANS: Link description in user account settings menu.
$widget->showMenuItem('profiledetailsettings',_m('Details'),$title);
return true;
}
function onEndProfilePageProfileElements(HTMLOutputter $out, Profile $profile) {
$user = User::staticGet('id', $profile->id); $user = User::staticGet('id', $profile->id);
if ($user) { if ($user) {
$url = common_local_url('profiledetail', array('nickname' => $user->nickname)); $url = common_local_url('profiledetail', array('nickname' => $user->nickname));
$out->element('a', array('href' => $url), _m('More details...')); $out->element('a', array('href' => $url), _m('More details...'));
} }
return; return true;
} }
} }

2
plugins/ExtendedProfile/profiledetailsettingsaction.php
View File

@ -44,14 +44,12 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
function showStylesheets() { function showStylesheets() {
parent::showStylesheets(); parent::showStylesheets();
$this->cssLink('plugins/ExtendedProfile/css/profiledetail.css'); $this->cssLink('plugins/ExtendedProfile/css/profiledetail.css');
$this->cssLink('http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery-ui.css');
return true; return true;
} }
function showScripts() { function showScripts() {
parent::showScripts(); parent::showScripts();
$this->script('plugins/ExtendedProfile/js/profiledetail.js'); $this->script('plugins/ExtendedProfile/js/profiledetail.js');
$this->script('http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js');
return true; return true;
} }