refactor common behaviour in settings pages

darcs-hash:20080630170342-84dde-5d7feb88a0a707b24c8070802a7ec99dd1f35687.gz

1 files changed, 11 insertions, 18 deletions

diff --git a/actions/avatar.php b/actions/avatar.php
index a22512750..ac28d8170 100644
--- a/actions/avatar.php
+++ b/actions/avatar.php
@@ -23,25 +23,18 @@ require_once(INSTALLDIR.'/lib/settingsaction.php');
 
 class AvatarAction extends SettingsAction {
 
-	function show_top($arr) {
-		$msg = $arr[0];
-		$success = $arr[1];
-		if ($msg) {
-			$this->message($msg, $success);
-		} else {
-			common_element('div', 'instructions', 
-						   _t('Upload a new "avatar" (user image) here. ' .
-							  'You can\'t edit the picture after you upload it, so ' .
-							  'make sure it\'s more or less square. ' . 
-							  'It must be under the site license, also. ' .
-							  'Use a picture that belongs to you and that you ' .
-							  'want to share.'));
-		}
-		$this->settings_menu();
+    function get_instructions() {
+		return _t('Upload a new "avatar" (user image) here. ' .
+				  'You can\'t edit the picture after you upload it, so ' .
+				  'make sure it\'s more or less square. ' .
+				  'It must be under the site license, also. ' .
+				  'Use a picture that belongs to you and that you ' .
+				  'want to share.');
 	}
-	
+
 	function show_form($msg=NULL, $success=false) {
-		common_show_header(_t('Avatar'), NULL, array($msg, $success), array($this, 'show_top'));
+
+		$this->form_header(_t('Avatar'), $msg, $success);
 
 		$user = common_current_user();
 		$profile = $user->getProfile();
@@ -120,7 +113,7 @@ class AvatarAction extends SettingsAction {
 
 		$user = common_current_user();
 		$profile = $user->getProfile();
-		
+
 		if ($profile->setOriginal($_FILES['avatarfile']['tmp_name'])) {
 			$this->show_form(_t('Avatar updated.'), true);
 		} else {