Commit 3692a090 authored by Zach Copley's avatar Zach Copley

Extended profile - add nav link to new profile block

parent 0666c6f8
......@@ -4,7 +4,7 @@
* Copyright (C) 2011, StatusNet, Inc.
*
* Profile block to show for an account
*
*
* PHP version 5
*
* This program is free software: you can redistribute it and/or modify
......@@ -63,8 +63,8 @@ class AccountProfileBlock extends ProfileBlock
if (empty($avatar)) {
$avatar = $this->profile->getAvatar(73);
}
return (!empty($avatar)) ?
$avatar->displayUrl() :
return (!empty($avatar)) ?
$avatar->displayUrl() :
Avatar::defaultImage(AVATAR_PROFILE_SIZE);
}
......@@ -95,21 +95,22 @@ class AccountProfileBlock extends ProfileBlock
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 ($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();
$this->out->elementStart('div', 'entity_actions');
......
......@@ -34,7 +34,7 @@ class ExtendedProfilePlugin extends Plugin
{
$versions[] = array('name' => 'ExtendedProfile',
'version' => STATUSNET_VERSION,
'author' => 'Brion Vibber',
'author' => 'Brion Vibber, Zach Copley',
'homepage' => 'http://status.net/wiki/Plugin:ExtendedProfile',
'rawdescription' =>
_m('UI extensions for additional profile fields.'));
......@@ -110,22 +110,13 @@ class ExtendedProfilePlugin extends Plugin
return true;
}
function onEndAccountSettingsProfileMenuItem($widget, $menu)
{
// 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) {
function onStartProfilePageActionsSection(HTMLOutputter $out, Profile $profile) {
$user = User::staticGet('id', $profile->id);
if ($user) {
$url = common_local_url('profiledetail', array('nickname' => $user->nickname));
$out->element('a', array('href' => $url), _m('More details...'));
}
return;
return true;
}
}
......@@ -44,14 +44,12 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
function showStylesheets() {
parent::showStylesheets();
$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;
}
function showScripts() {
parent::showScripts();
$this->script('plugins/ExtendedProfile/js/profiledetail.js');
$this->script('http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/jquery-ui.min.js');
return true;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment