GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'testing' of gitorious.org:statusnet/mainline into testing

Browse Source
This commit is contained in:
Evan Prodromou 2011-09-29 12:32:09 -04:00
commit 0316e279d7
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/SubMirror/SubMirrorPlugin.php
View File

@ -99,15 +99,16 @@ class SubMirrorPlugin extends Plugin
/** /**
* Menu item for personal subscriptions/groups area * Menu item for personal subscriptions/groups area
* *
* @param Widget $widget Widget being executed * @param Action $action action being executed
* *
* @return boolean hook return * @return boolean hook return
*/ */
function onEndSubGroupNav($widget) function onEndAccountSettingsNav($action)
{ {
$action = $widget->out;
$action_name = $action->trimmed('action'); $action_name = $action->trimmed('action');
common_debug("ACTION NAME = " . $action_name);
$action->menuItem(common_local_url('mirrorsettings'), $action->menuItem(common_local_url('mirrorsettings'),
// TRANS: SubMirror plugin menu item on user settings page. // TRANS: SubMirror plugin menu item on user settings page.
_m('MENU', 'Mirroring'), _m('MENU', 'Mirroring'),

11
plugins/SubMirror/actions/mirrorsettings.php
View File

@ -153,10 +153,17 @@ class MirrorSettingsAction extends SettingsAction
{ {
} }
/**
* Show the local navigation menu
*
* This is the same for all settings, so we show it here.
*
* @return void
*/
function showLocalNav() function showLocalNav()
{ {
$nav = new SubGroupNav($this, common_current_user()); $menu = new SettingsNav($this);
$nav->show(); $menu->show();
} }
function showScripts() function showScripts()