diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/common.php | 3 | ||||
| -rw-r--r-- | lib/stream.php | 29 | ||||
| -rw-r--r-- | lib/util.php | 23 |
3 files changed, 48 insertions, 7 deletions
diff --git a/lib/common.php b/lib/common.php index aac54b547..def183375 100644 --- a/lib/common.php +++ b/lib/common.php @@ -82,7 +82,8 @@ $config = array('backend' => 'mail', 'params' => NULL), 'nickname' => - array('blacklist' => array()), + array('blacklist' => array(), + 'featured' => array()), 'avatar' => array('server' => NULL), 'public' => diff --git a/lib/stream.php b/lib/stream.php index ea452096c..b19bf7c0f 100644 --- a/lib/stream.php +++ b/lib/stream.php @@ -10,11 +10,11 @@ * * 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 + * 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/>. + * along with this program. If not, see <http://www.gnu.org/licenses/>. */ if (!defined('LACONICA')) { exit(1); } @@ -23,6 +23,31 @@ require_once(INSTALLDIR.'/lib/personal.php'); class StreamAction extends PersonalAction { + + function public_views_menu() { + + $action = $this->trimmed('action'); + + common_debug("action = $action"); + + common_element_start('ul', array('id' => 'nav_views')); + + common_menu_item(common_local_url('public'), _('Public'), + _('Public timeline'), $action == 'public'); + + common_menu_item(common_local_url('tag'), _('Recent tags'), + _('Recent tags'), $action == 'tag'); + + common_menu_item(common_local_url('featured'), _('Featured'), + _('Notices from featured Users'), $action == 'featured'); + + common_menu_item(common_local_url('favorited'), _('Favorited'), + _("Most favorited notices"), $action == 'favorited'); + + common_element_end('ul'); + + } + function show_notice($notice) { global $config; $profile = $notice->getProfile(); diff --git a/lib/util.php b/lib/util.php index 68644e916..c8ccf63ff 100644 --- a/lib/util.php +++ b/lib/util.php @@ -317,7 +317,6 @@ function common_nav_menu() { _('Home')); } common_menu_item(common_local_url('peoplesearch'), _('Search')); - common_menu_item(common_local_url('tags'), _('Tags')); if ($user) { common_menu_item(common_local_url('profilesettings'), _('Settings')); @@ -948,10 +947,26 @@ function common_fancy_url($action, $args=NULL) { } else { return common_path(''); } + case 'featured': + if ($args && isset($args['page'])) { + return common_path('featured?page=' . $args['page']); + } else { + return common_path('featured'); + } + case 'favorited': + if ($args && isset($args['page'])) { + return common_path('favorited?page=' . $args['page']); + } else { + return common_path('favorited'); + } case 'publicrss': return common_path('rss'); case 'publicxrds': return common_path('xrds'); + case 'featuredrss': + return common_path('featuredrss'); + case 'favoritedrss': + return common_path('favoritedrss'); case 'opensearch': if ($args && $args['type']) { return common_path('opensearch/'.$args['type']); @@ -1098,11 +1113,11 @@ function common_fancy_url($action, $args=NULL) { switch (strtolower($args['method'])) { case 'user_timeline.rss': return common_path('api/statuses/user_timeline/'.$args['argument'].'.rss'); - case 'user_timeline.atom': + case 'user_timeline.atom': return common_path('api/statuses/user_timeline/'.$args['argument'].'.rss'); case 'user_timeline.rss': return common_path('api/statuses/user_timeline/'.$args['argument'].'.rss'); - case 'user_timeline.atom': + case 'user_timeline.atom': return common_path('api/statuses/user_timeline/'.$args['argument'].'.rss'); default: return common_simple_url($action, $args); } @@ -1110,7 +1125,7 @@ function common_fancy_url($action, $args=NULL) { } case 'sup': if ($args && isset($args['seconds'])) { - return common_path('main/sup?seconds='.$args['seconds']); + return common_path('main/sup?seconds='.$args['seconds']); } else { return common_path('main/sup'); } |