From f81b4421fe225ef9ce5fa7cb01539e0ed4439c43 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@prodromou.name>
Date: Wed, 11 Jun 2008 12:33:08 -0400
Subject: instructions

darcs-hash:20080611163308-84dde-c918f04fe6bba3dd382b822ef59cb70a57bb9504.gz
---
 actions/avatar.php | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'actions/avatar.php')

diff --git a/actions/avatar.php b/actions/avatar.php
index ffd003f74..720a02f6e 100644
--- a/actions/avatar.php
+++ b/actions/avatar.php
@@ -26,7 +26,15 @@ class AvatarAction extends SettingsAction {
 	function show_form($msg=NULL, $success=false) {
 		common_show_header(_t('Avatar'));
 		$this->settings_menu();
-		$this->message($msg, $success);
+		if ($msg) {
+			$this->message($msg, $success);
+		} else {
+			common_element('div', 'instructions', 
+						   _t('You can upload a new "avatar" (user picture) here. ' .
+							  'You can\'t edit the picture after you upload it, so you should ' .
+							  'edit it in your desktop image-manipulation software first. ' .
+							  'Everything works best if your picture is more or less square. '));
+		}
 
 		$user = common_current_user();
 		$profile = $user->getProfile();
-- 
cgit v1.2.3-54-g00ecf