forked from GNUsocial/gnu-social
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
This commit is contained in:
commit
f4ff375dbd
@ -323,7 +323,7 @@ class ShowgroupAction extends GroupDesignAction
|
|||||||
// TRANS: Header for group statistics on a group page (h2).
|
// TRANS: Header for group statistics on a group page (h2).
|
||||||
$this->element('h2', null, _('Statistics'));
|
$this->element('h2', null, _('Statistics'));
|
||||||
|
|
||||||
$this->elementEnd('dl');
|
$this->elementStart('dl');
|
||||||
$this->element('dt', null, _m('LABEL','Created'));
|
$this->element('dt', null, _m('LABEL','Created'));
|
||||||
$this->element('dd', 'entity_created', date('j M Y',
|
$this->element('dd', 'entity_created', date('j M Y',
|
||||||
strtotime($this->group->created)));
|
strtotime($this->group->created)));
|
||||||
|
@ -95,6 +95,8 @@ class AccountProfileBlock extends ProfileBlock
|
|||||||
|
|
||||||
function showActions()
|
function showActions()
|
||||||
{
|
{
|
||||||
|
if (Event::handle('StartProfilePageActionsSection', array($this->out, $this->profile))) {
|
||||||
|
|
||||||
if ($this->profile->hasRole(Profile_role::DELETED)) {
|
if ($this->profile->hasRole(Profile_role::DELETED)) {
|
||||||
$this->out->elementStart('div', 'entity_actions');
|
$this->out->elementStart('div', 'entity_actions');
|
||||||
// TRANS: H2 for user actions in a profile.
|
// TRANS: H2 for user actions in a profile.
|
||||||
@ -108,7 +110,6 @@ class AccountProfileBlock extends ProfileBlock
|
|||||||
$this->out->elementEnd('div');
|
$this->out->elementEnd('div');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (Event::handle('StartProfilePageActionsSection', array($this->out, $this->profile))) {
|
|
||||||
|
|
||||||
$cur = common_current_user();
|
$cur = common_current_user();
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@ abstract class ProfileBlock extends Widget
|
|||||||
|
|
||||||
function show()
|
function show()
|
||||||
{
|
{
|
||||||
$this->out->elementStart('div', 'profile_block');
|
$this->out->elementStart('div', 'profile_block section');
|
||||||
|
|
||||||
$size = $this->avatarSize();
|
$size = $this->avatarSize();
|
||||||
|
|
||||||
|
@ -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, 'class' => 'profiledetail'), _m('More details...'));
|
||||||
}
|
}
|
||||||
return;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -55,6 +55,7 @@
|
|||||||
float: left;
|
float: left;
|
||||||
padding-top: 2px;
|
padding-top: 2px;
|
||||||
padding-bottom: 2px;
|
padding-bottom: 2px;
|
||||||
|
max-width: 350px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#profiledetailsettings #content table.extended-profile td {
|
#profiledetailsettings #content table.extended-profile td {
|
||||||
|
@ -395,6 +395,8 @@ class ExtendedProfileWidget extends Form
|
|||||||
{
|
{
|
||||||
$this->out->elementStart('div', 'education-item');
|
$this->out->elementStart('div', 'education-item');
|
||||||
$this->out->element('div', 'label', _m('Institution'));
|
$this->out->element('div', 'label', _m('Institution'));
|
||||||
|
if (!empty($field['school'])) {
|
||||||
|
|
||||||
$this->out->element('div', 'field', $field['school']);
|
$this->out->element('div', 'field', $field['school']);
|
||||||
$this->out->element('div', 'label', _m('Degree'));
|
$this->out->element('div', 'label', _m('Degree'));
|
||||||
$this->out->element('div', 'field', $field['degree']);
|
$this->out->element('div', 'field', $field['degree']);
|
||||||
@ -414,6 +416,7 @@ class ExtendedProfileWidget extends Form
|
|||||||
date('j M Y', strtotime($field['end'])
|
date('j M Y', strtotime($field['end'])
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
}
|
||||||
$this->out->elementEnd('div');
|
$this->out->elementEnd('div');
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -442,7 +445,6 @@ class ExtendedProfileWidget extends Form
|
|||||||
);
|
);
|
||||||
|
|
||||||
$this->out->element('div', 'label', _m('Description'));
|
$this->out->element('div', 'label', _m('Description'));
|
||||||
$this->out->element('div', 'field', $field['description']);
|
|
||||||
|
|
||||||
$this->out->textarea(
|
$this->out->textarea(
|
||||||
$id . '-description',
|
$id . '-description',
|
||||||
@ -565,10 +567,11 @@ class ExtendedProfileWidget extends Form
|
|||||||
$out->input($id, null, $this->ext->getTextValue($name));
|
$out->input($id, null, $this->ext->getTextValue($name));
|
||||||
break;
|
break;
|
||||||
case 'date':
|
case 'date':
|
||||||
|
$value = $this->ext->getDateValue($name);
|
||||||
$out->input(
|
$out->input(
|
||||||
$id,
|
$id,
|
||||||
null,
|
null,
|
||||||
date('j M Y', strtotime($this->ext->getDateValue($name)))
|
empty($value) ? null : date('j M Y', strtotime($value))
|
||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
case 'person':
|
case 'person':
|
||||||
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -262,8 +260,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
|
|||||||
$this->removeAll($user, 'website');
|
$this->removeAll($user, 'website');
|
||||||
$i = 0;
|
$i = 0;
|
||||||
foreach($sites as $site) {
|
foreach($sites as $site) {
|
||||||
|
if (!empty($site['value']) && !Validate::uri(
|
||||||
if (!Validate::uri(
|
|
||||||
$site['value'],
|
$site['value'],
|
||||||
array('allowed_schemes' => array('http', 'https')))
|
array('allowed_schemes' => array('http', 'https')))
|
||||||
) {
|
) {
|
||||||
|
@ -413,6 +413,33 @@ address {
|
|||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.profile_block_name {
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
.profile_block_location {
|
||||||
|
font-weight: bold;
|
||||||
|
}
|
||||||
|
|
||||||
|
.profile_block_description {
|
||||||
|
line-height: 1.2em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.profile_block .entity_actions {
|
||||||
|
float: left;
|
||||||
|
margin-left: 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.profile_block .entity_moderation:hover ul,
|
||||||
|
.profile_block .entity_role:hover ul {
|
||||||
|
left: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.profile_block a.profiledetail {
|
||||||
|
display: block;
|
||||||
|
}
|
||||||
|
|
||||||
.section ul.entities {
|
.section ul.entities {
|
||||||
width: 220px;
|
width: 220px;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user