diff options
| -rw-r--r-- | actions/showstream.php | 5 | ||||
| -rw-r--r-- | actions/subscribed.php | 5 | ||||
| -rw-r--r-- | actions/subscriptions.php | 17 | ||||
| -rw-r--r-- | doc/TODO | 10 | ||||
| -rw-r--r-- | lib/common.php | 6 | ||||
| -rw-r--r-- | lib/stream.php | 2 |
6 files changed, 29 insertions, 16 deletions
diff --git a/actions/showstream.php b/actions/showstream.php index 5a04e9f47..30930de25 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -143,7 +143,8 @@ class ShowstreamAction extends StreamAction { } function show_subscriptions($profile) { - + global $config; + # XXX: add a limit $subs = $profile->getLink('id', 'subscription', 'subscriber'); @@ -166,7 +167,7 @@ class ShowstreamAction extends StreamAction { 'href' => $subs->profileurl, 'class' => 'subscription')); $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, 'height' => AVATAR_MINI_SIZE, 'class' => 'avatar mini', diff --git a/actions/subscribed.php b/actions/subscribed.php index 160267838..659118fb9 100644 --- a/actions/subscribed.php +++ b/actions/subscribed.php @@ -42,7 +42,8 @@ class SubscribedAction extends Action { } function show_subscribed($profile, $page) { - + global $config; + $subs = DB_DataObject::factory('subscription'); $subs->subscribed = $profile->id; @@ -68,7 +69,7 @@ class SubscribedAction extends Action { 'href' => $subs->profileurl, 'class' => 'subscription')); $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, 'height' => AVATAR_STREAM_SIZE, 'class' => 'avatar stream', diff --git a/actions/subscriptions.php b/actions/subscriptions.php index 37ed68a7f..c15bd5310 100644 --- a/actions/subscriptions.php +++ b/actions/subscriptions.php @@ -65,13 +65,16 @@ class SubscriptionsAction extends Action { 'href' => $subs->profileurl, 'class' => 'subscription')); $avatar = $subs->getAvatar(AVATAR_STREAM_SIZE); - common_element('img', array('src' => (($avatar) ? $avatar->url : DEFAULT_STREAM_AVATAR), - 'width' => AVATAR_STREAM_SIZE, - 'height' => AVATAR_STREAM_SIZE, - 'class' => 'avatar stream', - 'alt' => ($subs->fullname) ? - $subs->fullname : - $subs->nickname)); + common_element('img', + array('src' => + (($avatar) ? $avatar->url : + $config['avatar']['default']['stream']), + 'width' => AVATAR_STREAM_SIZE, + 'height' => AVATAR_STREAM_SIZE, + 'class' => 'avatar stream', + 'alt' => ($subs->fullname) ? + $subs->fullname : + $subs->nickname)); common_element_end('a'); # XXX: subscribe form here @@ -30,7 +30,7 @@ + add H2 for each page section - doc action + default to public stream -- default avatar ++ default avatar + default HTML type + set Content-Type + show current values in profile settings @@ -43,8 +43,8 @@ + validate newnotice form results + remove validation code from classes + 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 + friends - RSS 1.0 dump of a user's notices - RSS 1.0 feed of all public notices - RDF dump of entire site @@ -52,17 +52,21 @@ - license on showstream - license on shownotice - TOS checkbox on register -- pretty URLs - instructions - deal with PHP quotes escaping + fix layout of textarea + make notices into "big links" - fix spacing on notices +- fix spacing in profile - limit entry in textarea to 140 chars - add a next page link to showstream - add a next page link to public - add a next page link to all +- source link in footer menu +- AGPL notification - release 0.2 +- pretty URLs +- use only canonical email addresses - license per notice - allow mixed-case usernames - allow non-latin usernames diff --git a/lib/common.php b/lib/common.php index 66de209d6..a9fef15f3 100644 --- a/lib/common.php +++ b/lib/common.php @@ -45,7 +45,11 @@ $config = 'image' => 'http://i.creativecommons.org/l/by/3.0/88x31.png'), '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'); diff --git a/lib/stream.php b/lib/stream.php index 18b80d898..f5fcf226c 100644 --- a/lib/stream.php +++ b/lib/stream.php @@ -34,7 +34,7 @@ class StreamAction extends Action { 'id' => 'notice-' . $notice->id)); $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE); 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', 'width' => AVATAR_STREAM_SIZE, 'height' => AVATAR_STREAM_SIZE, |