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

default avatar

Browse Source 
darcs-hash:20080521115727-84dde-73b58873e08c936139bd63cffab0c30883c9f8a5.gz
This commit is contained in:
Evan Prodromou 2008-05-21 07:57:27 -04:00
parent 396027cde8
commit 289c44141d
6 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
actions/showstream.php
View File

@ -143,6 +143,7 @@ class ShowstreamAction extends StreamAction {
} }
function show_subscriptions($profile) { function show_subscriptions($profile) {
global $config;
# XXX: add a limit # XXX: add a limit
$subs = $profile->getLink('id', 'subscription', 'subscriber'); $subs = $profile->getLink('id', 'subscription', 'subscriber');
@ -166,7 +167,7 @@ class ShowstreamAction extends StreamAction {
'href' => $subs->profileurl, 'href' => $subs->profileurl,
'class' => 'subscription')); 'class' => 'subscription'));
$avatar = $subs->getAvatar(AVATAR_MINI_SIZE); $avatar = $subs->getAvatar(AVATAR_MINI_SIZE);
common_element('img', array('src' => (($avatar) ? $avatar->url : DEFAULT_MINI_AVATAR), common_element('img', array('src' => (($avatar) ? $avatar->url : $config['avatar']['default']['mini']),
'width' => AVATAR_MINI_SIZE, 'width' => AVATAR_MINI_SIZE,
'height' => AVATAR_MINI_SIZE, 'height' => AVATAR_MINI_SIZE,
'class' => 'avatar mini', 'class' => 'avatar mini',

3
actions/subscribed.php
View File

@ -42,6 +42,7 @@ class SubscribedAction extends Action {
} }
function show_subscribed($profile, $page) { function show_subscribed($profile, $page) {
global $config;
$subs = DB_DataObject::factory('subscription'); $subs = DB_DataObject::factory('subscription');
$subs->subscribed = $profile->id; $subs->subscribed = $profile->id;
@ -68,7 +69,7 @@ class SubscribedAction extends Action {
'href' => $subs->profileurl, 'href' => $subs->profileurl,
'class' => 'subscription')); 'class' => 'subscription'));
$avatar = $subs->getAvatar(AVATAR_STREAM_SIZE); $avatar = $subs->getAvatar(AVATAR_STREAM_SIZE);
common_element('img', array('src' => (($avatar) ? $avatar->url : DEFAULT_STREAM_AVATAR), common_element('img', array('src' => (($avatar) ? $avatar->url : $config['avatar']['default']['stream']),
'width' => AVATAR_STREAM_SIZE, 'width' => AVATAR_STREAM_SIZE,
'height' => AVATAR_STREAM_SIZE, 'height' => AVATAR_STREAM_SIZE,
'class' => 'avatar stream', 'class' => 'avatar stream',

17
actions/subscriptions.php
View File

@ -65,13 +65,16 @@ class SubscriptionsAction extends Action {
'href' => $subs->profileurl, 'href' => $subs->profileurl,
'class' => 'subscription')); 'class' => 'subscription'));
$avatar = $subs->getAvatar(AVATAR_STREAM_SIZE); $avatar = $subs->getAvatar(AVATAR_STREAM_SIZE);
common_element('img', array('src' => (($avatar) ? $avatar->url : DEFAULT_STREAM_AVATAR), common_element('img',
'width' => AVATAR_STREAM_SIZE, array('src' =>
'height' => AVATAR_STREAM_SIZE, (($avatar) ? $avatar->url :
'class' => 'avatar stream', $config['avatar']['default']['stream']),
'alt' => ($subs->fullname) ? 'width' => AVATAR_STREAM_SIZE,
$subs->fullname : 'height' => AVATAR_STREAM_SIZE,
$subs->nickname)); 'class' => 'avatar stream',
'alt' => ($subs->fullname) ?
$subs->fullname :
$subs->nickname));
common_element_end('a'); common_element_end('a');
# XXX: subscribe form here # XXX: subscribe form here

10
doc/TODO
View File

@ -30,7 +30,7 @@
+ add H2 for each page section + add H2 for each page section
- doc action - doc action
+ default to public stream + default to public stream
- default avatar + default avatar
+ default HTML type + default HTML type
+ set Content-Type + set Content-Type
+ show current values in profile settings + show current values in profile settings
@ -43,8 +43,8 @@
+ validate newnotice form results + validate newnotice form results
+ remove validation code from classes + remove validation code from classes
+ use only canonical usernames + use only canonical usernames
- use only canonical email addresses
- RSS 1.0 feeds of a user's notices - RSS 1.0 feeds of a user's notices
- RSS 1.0 feeds of a user's notices + friends
- RSS 1.0 dump of a user's notices - RSS 1.0 dump of a user's notices
- RSS 1.0 feed of all public notices - RSS 1.0 feed of all public notices
- RDF dump of entire site - RDF dump of entire site
@ -52,17 +52,21 @@
- license on showstream - license on showstream
- license on shownotice - license on shownotice
- TOS checkbox on register - TOS checkbox on register
- pretty URLs
- instructions - instructions
- deal with PHP quotes escaping - deal with PHP quotes escaping
+ fix layout of textarea + fix layout of textarea
+ make notices into "big links" + make notices into "big links"
- fix spacing on notices - fix spacing on notices
- fix spacing in profile
- limit entry in textarea to 140 chars - limit entry in textarea to 140 chars
- add a next page link to showstream - add a next page link to showstream
- add a next page link to public - add a next page link to public
- add a next page link to all - add a next page link to all
- source link in footer menu
- AGPL notification
- release 0.2 - release 0.2
- pretty URLs
- use only canonical email addresses
- license per notice - license per notice
- allow mixed-case usernames - allow mixed-case usernames
- allow non-latin usernames - allow non-latin usernames

6
lib/common.php
View File

@ -45,7 +45,11 @@ $config =
'image' => 'http://i.creativecommons.org/l/by/3.0/88x31.png'), 'image' => 'http://i.creativecommons.org/l/by/3.0/88x31.png'),
'avatar' => 'avatar' =>
array('directory' => INSTALLDIR . '/avatar', array('directory' => INSTALLDIR . '/avatar',
'path' => '/avatar') 'path' => '/avatar',
'default' =>
array('profile' => INSTALLDIR .'theme/default/image/default-avatar-profile.png',
'stream' => INSTALLDIR .'theme/default/image/default-avatar-stream.png',
'mini' => INSTALLDIR .'theme/default/image/default-avatar-mini.png'))
); );
$config['db'] = &PEAR::getStaticProperty('DB_DataObject','options'); $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');

2
lib/stream.php
View File

@ -34,7 +34,7 @@ class StreamAction extends Action {
'id' => 'notice-' . $notice->id)); 'id' => 'notice-' . $notice->id));
$avatar = $profile->getAvatar(AVATAR_STREAM_SIZE); $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
common_element_start('a', array('href' => $profile->profileurl)); common_element_start('a', array('href' => $profile->profileurl));
common_element('img', array('src' => ($avatar) ? $avatar->url : DEFAULT_STREAM_AVATAR, common_element('img', array('src' => ($avatar) ? $avatar->url : $config['avatar']['default']['stream'],
'class' => 'avatar stream', 'class' => 'avatar stream',
'width' => AVATAR_STREAM_SIZE, 'width' => AVATAR_STREAM_SIZE,
'height' => AVATAR_STREAM_SIZE, 'height' => AVATAR_STREAM_SIZE,