refactor common code between searches and between search and settings

darcs-hash:20080709231031-84dde-929095ca3844ed6fe7ebd535fc9696678a5fcb0f.gz

1 files changed, 16 insertions, 25 deletions

diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 0cdbbbeb2..1fbf88ecb 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -80,30 +80,21 @@ class SettingsAction extends Action {
     function settings_menu() {
         # action => array('prompt', 'title')
         static $menu =
-        array('profilesettings' =>
-              array('Profile',
-              		'Change your profile settings'),
-            'avatar' =>
-            array('Avatar',
-                  'Upload a new profile image'),
-            'password' =>
-            array('Password',
-                  'Change your password'),
-            'openidsettings' =>
-            array('OpenID',
-                  'Add or remove OpenIDs'),
-            'imsettings' =>
-            array('IM',
-                  'Updates by instant messenger (IM)'));
-
-        $action = $this->trimmed('action');
-        common_element_start('ul', array('id' => 'nav_views'));
-        foreach ($menu as $menuaction => $menudesc) {
-            common_menu_item(common_local_url($menuaction),
-                    _t($menudesc[0]),
-                    _t($menudesc[1]),
-                    $action == $menuaction);
-        }
-        common_element_end('ul');
+		  array('profilesettings' =>
+				array('Profile',
+					  'Change your profile settings'),
+				'avatar' =>
+				array('Avatar',
+					  'Upload a new profile image'),
+				'password' =>
+				array('Password',
+					  'Change your password'),
+				'openidsettings' =>
+				array('OpenID',
+					  'Add or remove OpenIDs'),
+				'imsettings' =>
+				array('IM',
+					  'Updates by instant messenger (IM)'));
+		$this->nav_menu($menu);
     }
 }