new noticelist classes for primary and section lists

This commit is contained in:
Mikael Nordfeldth 2015-01-08 20:19:43 +01:00
parent 5a76390d46
commit a3b9367c9a
4 changed files with 108 additions and 16 deletions

View File

@ -94,9 +94,8 @@ class NoticeList extends Widget
* *
* @return int Total amount of notices actually available. * @return int Total amount of notices actually available.
*/ */
function show() public function show()
{ {
$this->out->elementStart('div', array('id' =>'notices_primary'));
$this->out->elementStart('ol', array('class' => 'notices xoxo')); $this->out->elementStart('ol', array('class' => 'notices xoxo'));
$notices = $this->notice->fetchAll(); $notices = $this->notice->fetchAll();
@ -118,8 +117,6 @@ class NoticeList extends Widget
} }
$this->out->elementEnd('ol'); $this->out->elementEnd('ol');
$this->out->elementEnd('div');
return $total; return $total;
} }

View File

@ -48,21 +48,10 @@ define('NOTICES_PER_SECTION', 6);
class NoticeSection extends Section class NoticeSection extends Section
{ {
protected $addressees = false;
protected $attachments = false;
protected $maxchars = 140;
protected $options = false;
protected $show_n = NOTICES_PER_SECTION;
function showContent() function showContent()
{ {
// args: notice object, html outputter, preference array for list and items // args: notice object, html outputter, preference array for list and items
$list = new NoticeList($this->getNotices(), $this->out, $list = new SectionNoticeList($this->getNotices(), $this->out);
array('addressees' => $this->addressees,
'attachments' => $this->attachments,
'maxchars'=> $this->maxchars,
'options' => $this->options,
'show_n' => $this->show_n));
$total = $list->show(); // returns total amount of notices available $total = $list->show(); // returns total amount of notices available
return ($total > NOTICES_PER_SECTION); // do we have more to show? return ($total > NOTICES_PER_SECTION); // do we have more to show?
} }

54
lib/primarynoticelist.php Normal file
View File

@ -0,0 +1,54 @@
<?php
/**
* StatusNet, the distributed open-source microblogging tool
*
* widget for displaying a list of notices
*
* PHP version 5
*
* LICENCE: This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @category UI
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @author Sarven Capadisli <csarven@status.net>
* @copyright 2008 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
if (!defined('GNUSOCIAL') && !defined('STATUSNET')) { exit(1); }
/**
* widget for displaying a list of notices in the primary content area
*
* @category UI
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
* @see Notice
* @see NoticeListItem
* @see ProfileNoticeList
*/
class PrimaryNoticeList extends NoticeList
{
public function show()
{
$this->out->elementStart('div', array('id' =>'notices_primary'));
$total = parent::show();
$this->out->elementEnd('div');
return $total;
}
}

52
lib/sectionnoticelist.php Normal file
View File

@ -0,0 +1,52 @@
<?php
/**
* StatusNet, the distributed open-source microblogging tool
*
* widget for displaying a list of notices
*
* PHP version 5
*
* LICENCE: This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @category UI
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @author Sarven Capadisli <csarven@status.net>
* @copyright 2008 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
*/
if (!defined('GNUSOCIAL') && !defined('STATUSNET')) { exit(1); }
/**
* widget for displaying a list of notices in the primary content area
*
* @category UI
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/
* @see Notice
* @see NoticeListItem
* @see ProfileNoticeList
*/
class SectionNoticeList extends NoticeList
{
protected $addressees = false;
protected $attachments = false;
protected $maxchars = 140;
protected $options = false;
protected $show_n = NOTICES_PER_SECTION;
}