exit(1);
}
+require_once INSTALLDIR.'/lib/favorform.php';
+require_once INSTALLDIR.'/lib/disfavorform.php';
+
/**
* widget for displaying a list of notices
*
* @see ProfileNoticeList
*/
-class NoticeList
+class NoticeList extends Widget
{
/** the current stream of notices being displayed. */
* @param Notice $notice stream of notices from DB_DataObject
*/
- function __construct($notice)
+ function __construct($notice, $out=null)
{
+ parent::__construct($out);
$this->notice = $notice;
}
function show()
{
- common_element_start('ul', array('id' => 'notices'));
+ $this->out->elementStart('div', array('id' =>'notices_primary'));
+ $this->out->element('h2', null, _('Notices'));
+ $this->out->elementStart('ul', array('class' => 'notices'));
$cnt = 0;
$item->show();
}
- common_element_end('ul');
+ $this->out->elementEnd('ul');
+ $this->out->elementEnd('div');
return $cnt;
}
function newListItem($notice)
{
- return new NoticeListItem($notice);
+ return new NoticeListItem($notice, $this->out);
}
}
* @see ProfileNoticeListItem
*/
-class NoticeListItem
+class NoticeListItem extends Widget
{
/** The notice this item will show. */
* @param Notice $notice The notice we'll display
*/
- function __construct($notice)
+ function __construct($notice, $out=null)
{
+ parent::__construct($out);
$this->notice = $notice;
$this->profile = $notice->getProfile();
}
function show()
{
$this->showStart();
- $this->showFaveForm();
+ $this->showNotice();
+ $this->showNoticeInfo();
+ $this->showNoticeOptions();
+ $this->showEnd();
+ }
+
+ function showNotice()
+ {
+ $this->out->elementStart('div', 'entry-title');
$this->showAuthor();
$this->showContent();
- $this->startTimeSection();
+ $this->out->elementEnd('div');
+ }
+
+ function showNoticeInfo()
+ {
+ $this->out->elementStart('div', 'entry-content');
$this->showNoticeLink();
$this->showNoticeSource();
$this->showReplyTo();
+ $this->out->elementEnd('div');
+ }
+
+ function showNoticeOptions()
+ {
+ $this->out->elementStart('div', 'notice-options');
+ $this->showFaveForm();
$this->showReplyLink();
$this->showDeleteLink();
- $this->endTimeSection();
- $this->showEnd();
+ $this->out->elementEnd('div');
}
+
/**
* start a single notice.
*
{
// XXX: RDFa
// TODO: add notice_type class e.g., notice_video, notice_image
- common_element_start('li', array('class' => 'hentry notice',
+ $this->out->elementStart('li', array('class' => 'hentry notice',
'id' => 'notice-' . $this->notice->id));
}
$user = common_current_user();
if ($user) {
if ($user->hasFave($this->notice)) {
- common_disfavor_form($this->notice);
+ $disfavor = new DisfavorForm($this->out, $this->notice);
+ $disfavor->show();
} else {
- common_favor_form($this->notice);
+ $favor = new FavorForm($this->out, $this->notice);
+ $favor->show();
}
}
}
function showAuthor()
{
- common_element_start('span', 'vcard author');
- common_element_start('a', array('href' => $this->profile->profileurl,
+ $this->out->elementStart('span', 'vcard author');
+ $this->out->elementStart('a', array('href' => $this->profile->profileurl,
'class' => 'url'));
$this->showAvatar();
$this->showNickname();
- common_element_end('a');
- common_element_end('span');
+ $this->out->elementEnd('a');
+ $this->out->elementEnd('span');
}
/**
{
$avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
- common_element('img', array('src' => ($avatar) ?
+ $this->out->element('img', array('src' => ($avatar) ?
common_avatar_display_url($avatar) :
common_default_avatar(AVATAR_STREAM_SIZE),
'class' => 'avatar photo',
function showNickname()
{
- common_element('span', array('class' => 'nickname fn'),
+ $this->out->element('span', array('class' => 'nickname fn'),
$this->profile->nickname);
}
function showContent()
{
// FIXME: URL, image, video, audio
- common_element_start('p', array('class' => 'content entry-title'));
+ $this->out->elementStart('p', array('class' => 'entry-content'));
if ($this->notice->rendered) {
- common_raw($this->notice->rendered);
+ $this->out->raw($this->notice->rendered);
} else {
// XXX: may be some uncooked notices in the DB,
// we cook them right now. This should probably disappear in future
// versions (>> 0.4.x)
- common_raw(common_render_content($this->notice->content, $this->notice));
+ $this->out->raw(common_render_content($this->notice->content, $this->notice));
}
- common_element_end('p');
- }
-
- /**
- * show the "time" section of a notice
- *
- * This is the greyed-out section that appears beneath the content, including
- * links to delete or reply to the notice. Probably should be called something
- * else.
- *
- * @return void
- */
-
- function startTimeSection()
- {
- common_element_start('p', 'time');
+ $this->out->elementEnd('p');
}
/**
preg_match('/^http/', $this->notice->uri)) {
$noticeurl = $this->notice->uri;
}
- common_element_start('a', array('class' => 'permalink',
- 'rel' => 'bookmark',
+ $this->out->elementStart('dl', 'timestamp');
+ $this->out->element('dt', null, _('Published'));
+ $this->out->elementStart('dd', null);
+ $this->out->elementStart('a', array('rel' => 'bookmark',
'href' => $noticeurl));
$dt = common_date_iso8601($this->notice->created);
- common_element('abbr', array('class' => 'published',
+ $this->out->element('abbr', array('class' => 'published',
'title' => $dt),
common_date_string($this->notice->created));
- common_element_end('a');
+ $this->out->elementEnd('a');
+ $this->out->elementEnd('dd');
+ $this->out->elementEnd('dl');
}
/**
function showNoticeSource()
{
if ($this->notice->source) {
- $this->elementStart('dl', 'device');
- $this->element('dt', null, _('From'));
+ $this->out->elementStart('dl', 'device');
+ $this->out->element('dt', null, _('From'));
$source_name = _($this->notice->source);
switch ($this->notice->source) {
case 'web':
case 'mail':
case 'omb':
case 'api':
- $this->element('dd', 'noticesource', $source_name);
+ $this->out->element('dd', 'noticesource', $source_name);
break;
default:
$ns = Notice_source::staticGet($this->notice->source);
if ($ns) {
- $this->elementStart('dd', null);
- $this->element('a', array('href' => $ns->url,
+ $this->out->elementStart('dd', null);
+ $this->out->element('a', array('href' => $ns->url,
'rel' => 'external'),
$ns->name);
- $this->elementEnd('dd');
+ $this->out->elementEnd('dd');
} else {
- $this->element('dd', 'noticesource', $source_name);
+ $this->out->element('dd', 'noticesource', $source_name);
}
break;
}
- $this->elementEnd('dl');
+ $this->out->elementEnd('dl');
}
}
if ($this->notice->reply_to) {
$replyurl = common_local_url('shownotice',
array('notice' => $this->notice->reply_to));
- $this->elementStart('dl', 'response');
- $this->element('dt', null, _('To'));
- $this->elementStart('dd');
- $this->element('a', array('class' => 'inreplyto',
- 'href' => $replyurl,
+ $this->out->elementStart('dl', 'response');
+ $this->out->element('dt', null, _('To'));
+ $this->out->elementStart('dd');
+ $this->out->element('a', array('href' => $replyurl,
'rel' => 'in-reply-to'),
_('in reply to'));
- $this->elementEnd('dd');
- $this->elementEnd('dl');
+ $this->out->elementEnd('dd');
+ $this->out->elementEnd('dl');
}
}
$reply_url = common_local_url('newnotice',
array('replyto' => $this->profile->nickname));
- $reply_js =
- 'return doreply("'.$this->profile->nickname.'",'.$this->notice->id.');';
-
- common_element_start('a',
- array('href' => $reply_url,
- 'onclick' => $reply_js,
- 'title' => _('reply'),
- 'class' => 'replybutton'));
- common_raw(' →');
- common_element_end('a');
+ $this->out->elementStart('dl', 'reply');
+ $this->out->element('dt', null, _('Reply to this notice'));
+ $this->out->elementStart('dd');
+ $this->out->element('a', array('href' => $reply_url,
+ 'title' => _('reply')), _('Reply'));
+ $this->out->elementEnd('dd');
+ $this->out->elementEnd('dl');
}
/**
if ($user && $this->notice->profile_id == $user->id) {
$deleteurl = common_local_url('deletenotice',
array('notice' => $this->notice->id));
- common_element_start('a', array('class' => 'deletenotice',
+ $this->out->elementStart('a', array('class' => 'deletenotice',
'href' => $deleteurl,
'title' => _('delete')));
- common_raw(' ×');
- common_element_end('a');
+ $this->out->raw(' ×');
+ $this->out->elementEnd('a');
}
}
- /**
- * end the time section
- *
- * @return void
- */
-
- function endTimeSection()
- {
- common_element_end('p');
- }
-
/**
* finish the notice
*
function showEnd()
{
- common_element_end('li');
+ $this->out->elementEnd('li');
}
}
projects / quix0rs-gnu-social.git / blobdiff