X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowstream.php;h=30930de25a64351ce052b62f6cd192f12bbe06ed;hb=53eeee70e7eaba81b44f35d787b218f8ebaa69e6;hp=45e155feab9d9a46c3b0fed33479b1a60de031b7;hpb=466f0489c364441c125dffe6c9040bf6fcafd043;p=quix0rs-gnu-social.git diff --git a/actions/showstream.php b/actions/showstream.php index 45e155feab..30930de25a 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -35,12 +35,14 @@ class ShowstreamAction extends StreamAction { if (!$user) { $this->no_such_user(); + return; } $profile = $user->getProfile(); if (!$profile) { common_server_error(_t('User record exists without profile.')); + return; } # Looks like we're good; show the header @@ -50,14 +52,29 @@ class ShowstreamAction extends StreamAction { $cur = common_current_user(); if ($cur && $profile->id == $cur->id) { - $this->notice_form(); + common_notice_form(); } + $this->show_sidebar($profile); + + $this->show_notices($profile); + + common_show_footer(); + } + + function no_such_user() { + common_user_error('No such user'); + } + + function show_sidebar($profile) { + + common_element_start('div', 'sidebar width33 floatRight greenBg'); + $this->show_profile($profile); $this->show_last_notice($profile); - if ($cur) { + if ($cur && $cur->id != $profile->id) { if ($cur->isSubscribed($profile)) { $this->show_unsubscribe_form($profile); } else { @@ -69,36 +86,22 @@ class ShowstreamAction extends StreamAction { $this->show_subscriptions($profile); - $this->show_notices($profile); - - common_show_footer(); - } - - function no_such_user() { - common_user_error('No such user'); - } - - function notice_form() { - common_element_start('form', array('id' => 'newnotice', 'method' => 'POST', - 'action' => common_local_url('newnotice'))); - common_element('textarea', array('rows' => 4, 'cols' => 80, - 'name' => 'content', - 'id' => 'content')); - common_element('input', array('type' => 'submit', 'value' => 'Send')); - common_element_end('form'); + common_element_end('div'); } - + function show_profile($profile) { common_element_start('div', 'profile'); + + common_element('h2', 'nickname', $profile->nickname); + $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); if ($avatar) { common_element('img', array('src' => $avatar->url, 'class' => 'avatar profile', 'width' => AVATAR_PROFILE_SIZE, 'height' => AVATAR_PROFILE_SIZE, - 'title' => $profile->nickname)); + 'alt' => $profile->nickname)); } - common_element('span', 'nickname', $profile->nickname); if ($profile->fullname) { if ($profile->homepage) { common_element('a', array('href' => $profile->homepage, @@ -114,6 +117,7 @@ class ShowstreamAction extends StreamAction { if ($profile->bio) { common_element('div', 'bio', $profile->bio); } + common_element_end('div'); } function show_subscribe_form($profile) { @@ -123,7 +127,7 @@ class ShowstreamAction extends StreamAction { 'name' => 'subscribeto', 'type' => 'hidden', 'value' => $profile->nickname)); - common_element('input', array('type' => 'submit'), _t('subscribe')); + common_element('input', array('type' => 'submit', 'value' => _t('Subscribe'))); common_element_end('form'); } @@ -134,17 +138,20 @@ class ShowstreamAction extends StreamAction { 'name' => 'unsubscribeto', 'type' => 'hidden', 'value' => $profile->nickname)); - common_element('input', array('type' => 'submit'), _t('unsubscribe')); + common_element('input', array('type' => 'submit'), _t('Unsubscribe')); common_element_end('form'); } function show_subscriptions($profile) { - + global $config; + # XXX: add a limit $subs = $profile->getLink('id', 'subscription', 'subscriber'); common_element_start('div', 'subscriptions'); + common_element('h2', 'subscriptions', _t('Subscriptions')); + $cnt = 0; if ($subs) { @@ -154,15 +161,19 @@ class ShowstreamAction extends StreamAction { common_element_start('div', 'row'); } - common_element_start('a', array('title' => $subs->fullname || + common_element_start('a', array('title' => ($subs->fullname) ? + $subs->fullname : $subs->nickname, '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')); + 'height' => AVATAR_MINI_SIZE, + 'class' => 'avatar mini', + 'alt' => ($subs->fullname) ? + $subs->fullname : + $subs->nickname)); common_element_end('a'); if ($cnt % SUBSCRIPTIONS_PER_ROW == 0) { @@ -190,23 +201,40 @@ class ShowstreamAction extends StreamAction { $subs->subscriber = $profile->id; $subs_count = $subs->count(); + if (!$subs_count) { + $subs_count = 0; + } + $subbed = DB_DataObject::factory('subscription'); $subbed->subscribed = $profile->id; $subbed_count = $subbed->count(); + if (!$subbed_count) { + $subbed_count = 0; + } + $notices = DB_DataObject::factory('notice'); $notices->profile_id = $profile->id; $notice_count = $notices->count(); + if (!$notice_count) { + $notice_count = 0; + } + + common_element_start('div', 'statistics'); + common_element('h2', 'statistics', _t('Statistics')); + # Other stats...? common_element_start('dl', 'statistics'); - common_element('dt', _t('Subscriptions')); - common_element('dd', $subs_count); - common_element('dt', _t('Subscribers')); - common_element('dd', $subbed_count); - common_element('dt', _t('Notices')); - common_element('dd', $notice_count); + common_element('dt', 'subscriptions', _t('Subscriptions')); + common_element('dd', 'subscriptions', $subs_count); + common_element('dt', 'subscribers', _t('Subscribers')); + common_element('dd', 'subscribers', $subbed_count); + common_element('dt', 'notices', _t('Notices')); + common_element('dd', 'notices', $notice_count); common_element_end('dl'); + + common_element_end('div'); } function show_notices($profile) { @@ -218,32 +246,55 @@ class ShowstreamAction extends StreamAction { $page = $this->arg('page') || 1; - $notice->limit((($page-1)*NOTICES_PER_PAGE) + 1, NOTICES_PER_PAGE); + $notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE); $notice->find(); - common_element_start('div', 'notices'); + common_element_start('div', 'notices width66 floatLeft'); + common_element_start('ul', 'bigLinks'); + while ($notice->fetch()) { $this->show_notice($notice); } - + + common_element_end('ul'); + + # XXX: show a link for the next page common_element_end('div'); } function show_last_notice($profile) { + + common_element_start('div', 'lastnotice'); + common_element('h2', 'lastnotice', _t('Currently')); + $notice = DB_DataObject::factory('notice'); $notice->profile_id = $profile->id; $notice->orderBy('created DESC'); - $notice->limit(1, 1); - $notice->find(); + $notice->limit(0, 1); - while ($notice->fetch()) { + if ($notice->find(true)) { # FIXME: URL, image, video, audio common_element('span', array('class' => 'content'), $notice->content); - common_element('span', array('class' => 'date'), - common_date_string($notice->created)); } + + common_element_end('div'); + } + + function show_notice($notice) { + $profile = $notice->getProfile(); + # XXX: RDFa + common_element_start('li', array('class' => 'notice', + 'id' => 'notice-' . $notice->id)); + $noticeurl = common_local_url('shownotice', array('notice' => $notice->id)); + # FIXME: URL, image, video, audio + common_element_start('a', array('class' => 'notice', + 'href' => $noticeurl)); + common_element('span', 'title', common_date_string($notice->created)); + common_element('span', 'desc', $notice->content); + common_element_end('a'); + common_element_end('li'); } }