GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

Browse Source
This commit is contained in:
Evan Prodromou 2011-03-16 15:00:22 -04:00
commit f4ff375dbd
8 changed files with 76 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/showgroup.php
View File

@ -323,7 +323,7 @@ class ShowgroupAction extends GroupDesignAction
// TRANS: Header for group statistics on a group page (h2).
$this->element('h2', null, _('Statistics'));
$this->elementEnd('dl');
$this->elementStart('dl');
$this->element('dt', null, _m('LABEL','Created'));
$this->element('dd', 'entity_created', date('j M Y',
strtotime($this->group->created)));

33
lib/accountprofileblock.php
View File

@ -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');

2
lib/profileblock.php
View File

@ -56,7 +56,7 @@ abstract class ProfileBlock extends Widget
function show()
{
$this->out->elementStart('div', 'profile_block');
$this->out->elementStart('div', 'profile_block section');
$size = $this->avatarSize();

17
plugins/ExtendedProfile/ExtendedProfilePlugin.php
View File

@ -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...'));
$out->element('a', array('href' => $url, 'class' => 'profiledetail'), _m('More details...'));
}
return;
return true;
}
}

1
plugins/ExtendedProfile/css/profiledetail.css
View File

@ -55,6 +55,7 @@
float: left;
padding-top: 2px;
padding-bottom: 2px;
max-width: 350px;
}
#profiledetailsettings #content table.extended-profile td {

45
plugins/ExtendedProfile/extendedprofilewidget.php
View File

@ -395,25 +395,28 @@ class ExtendedProfileWidget extends Form
{
$this->out->elementStart('div', 'education-item');
$this->out->element('div', 'label', _m('Institution'));
$this->out->element('div', 'field', $field['school']);
$this->out->element('div', 'label', _m('Degree'));
$this->out->element('div', 'field', $field['degree']);
$this->out->element('div', 'label', _m('Description'));
$this->out->element('div', 'field', $field['description']);
$this->out->element('div', 'label', _m('Start'));
$this->out->element(
'div',
array('class' => 'field date'),
date('j M Y', strtotime($field['start'])
)
);
$this->out->element('div', 'label', _m('End'));
$this->out->element(
'div',
array('class' => 'field date'),
date('j M Y', strtotime($field['end'])
)
);
if (!empty($field['school'])) {
$this->out->element('div', 'field', $field['school']);
$this->out->element('div', 'label', _m('Degree'));
$this->out->element('div', 'field', $field['degree']);
$this->out->element('div', 'label', _m('Description'));
$this->out->element('div', 'field', $field['description']);
$this->out->element('div', 'label', _m('Start'));
$this->out->element(
'div',
array('class' => 'field date'),
date('j M Y', strtotime($field['start'])
)
);
$this->out->element('div', 'label', _m('End'));
$this->out->element(
'div',
array('class' => 'field date'),
date('j M Y', strtotime($field['end'])
)
);
}
$this->out->elementEnd('div');
}
@ -442,7 +445,6 @@ class ExtendedProfileWidget extends Form
);
$this->out->element('div', 'label', _m('Description'));
$this->out->element('div', 'field', $field['description']);
$this->out->textarea(
$id . '-description',
@ -565,10 +567,11 @@ class ExtendedProfileWidget extends Form
$out->input($id, null, $this->ext->getTextValue($name));
break;
case 'date':
$value = $this->ext->getDateValue($name);
$out->input(
$id,
null,
date('j M Y', strtotime($this->ext->getDateValue($name)))
empty($value) ? null : date('j M Y', strtotime($value))
);
break;
case 'person':

5
plugins/ExtendedProfile/profiledetailsettingsaction.php
View File

@ -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;
}
@ -262,8 +260,7 @@ class ProfileDetailSettingsAction extends ProfileSettingsAction
$this->removeAll($user, 'website');
$i = 0;
foreach($sites as $site) {
if (!Validate::uri(
if (!empty($site['value']) && !Validate::uri(
$site['value'],
array('allowed_schemes' => array('http', 'https')))
) {

27
theme/neo/css/display.css
View File

@ -413,6 +413,33 @@ address {
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 {
width: 220px;
}