diff options
| -rw-r--r-- | doc/roadmap | 16 | ||||
| -rw-r--r-- | lib/settingsaction.php | 14 | ||||
| -rw-r--r-- | lib/util.php | 23 |
3 files changed, 40 insertions, 13 deletions
diff --git a/doc/roadmap b/doc/roadmap index dcad5e393..65f2750f0 100644 --- a/doc/roadmap +++ b/doc/roadmap @@ -151,10 +151,16 @@ Release 0.4 + AGPL notification - Check licenses of all libraries for compatibility - jQuery for as much as possible +- forward notices to Jabber +- receive notices from Jabber +- forward notices to other IM +- forward notices to mobile phone +- receive notices from other IM +- receive notices from mobile phone - microid for profile page - format times per user - timezone preferences in Profile settings -- email notification on subscriptions ++ email notification on subscriptions - content negotiation for interface language - user preference for interface language - gettext @@ -167,7 +173,7 @@ Release 0.4 - content negotiation for encoding - If-Modified-Since support - Vary -- site logo ++ site logo - check license compatibility for remote subscribe - optional FOAF URL in openmicroblogging exchange - subscribe/unsubscribe on subscriptions page @@ -196,8 +202,6 @@ Release 0.5 - stay logged in between sessions - use RSS as a subscription - license per attachment -- forward notices to Jabber -- receive notices from Jabber Release 0.6 ----------- @@ -206,10 +210,6 @@ Release 0.6 - image notices - video notices - audio notices -- forward notices to other IM -- forward notices to mobile phone -- receive notices from other IM -- receive notices from mobile phone - machine tags Release 1.0 diff --git a/lib/settingsaction.php b/lib/settingsaction.php index 8f3b1e6be..0255fc642 100644 --- a/lib/settingsaction.php +++ b/lib/settingsaction.php @@ -64,6 +64,20 @@ class SettingsAction extends Action { _t('Password'), _t('Change your password'), $action == 'password'); + if (false) { + common_menu_item(common_local_url('emailsettings'), + _t('Email'), + _t('Address and preferences'), + $action == 'emailsettings'); + common_menu_item(common_local_url('imsettings'), + _t('IM'), + _t('Notifications by instant messenger'), + $action == 'imsettings'); + common_menu_item(common_local_url('phonesettings'), + _t('Phone'), + _t('Notifications by phone'), + $action == 'phonesettings'); + } common_element_end('ul'); } } diff --git a/lib/util.php b/lib/util.php index ff992141e..1c6bbaf16 100644 --- a/lib/util.php +++ b/lib/util.php @@ -509,7 +509,11 @@ function common_local_url($action, $args=NULL) { function common_fancy_url($action, $args=NULL) { switch (strtolower($action)) { case 'public': - return common_path(''); + if ($args && $args['page']) { + return common_path('?page=' . $args['page']); + } else { + return common_path(''); + } case 'publicrss': return common_path('rss'); case 'doc': @@ -529,18 +533,27 @@ function common_fancy_url($action, $args=NULL) { return common_path('notice/new'); case 'shownotice': return common_path('notice/'.$args['notice']); - case 'subscriptions': - case 'subscribed': case 'xrds': - case 'all': case 'foaf': return common_path($args['nickname'].'/'.$action); + case 'subscriptions': + case 'subscribed': + case 'all': + if ($args && $args['page']) { + return common_path($args['nickname'].'/'.$action.'?page=' . $args['page']); + } else { + return common_path($args['nickname'].'/'.$action); + } case 'allrss': return common_path($args['nickname'].'/all/rss'); case 'userrss': return common_path($args['nickname'].'/rss'); case 'showstream': - return common_path($args['nickname']); + if ($args && $args['page']) { + return common_path($args['nickname'].'?page=' . $args['page']); + } else { + return common_path($args['nickname']); + } default: return common_simple_url($action, $args); } |