X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fpassword.php;h=603ae58eaf0405c9884b775c0c2b0b50cdc879c0;hb=c02a01914ab67c2bc25850034a75ee1046fd6870;hp=3a89c99d333a5f90ffd9223b1bf394767c45a7bf;hpb=3f5ededc01d8eedac2a9a75917849fbe78a3e701;p=quix0rs-gnu-social.git

diff --git a/actions/password.php b/actions/password.php
index 3a89c99d33..603ae58eaf 100644
--- a/actions/password.php
+++ b/actions/password.php
@@ -24,16 +24,22 @@ require_once(INSTALLDIR.'/lib/settingsaction.php');
 class PasswordAction extends SettingsAction {
 
 	function show_form($msg=NULL, $success=false) {
-		common_show_header(_t('Change password'));
-		$this->settings_menu();
-		$this->message($msg, $success);
+		common_show_header(_t('Change password'), NULL, NULL, array($this, 'settings_menu'));
+		if ($msg) {
+			$this->message($msg, $success);
+		} else {
+			common_element('div', 'instructions', 
+						   _t('You can change your password here. Choose a good one!'));
+		}
 		common_element_start('form', array('method' => 'POST',
 										   'id' => 'password',
 										   'action' =>
 										   common_local_url('password')));
 		common_password('oldpassword', _t('Old password'));
-		common_password('newpassword', _t('New password'));
-		common_password('confirm', _t('Confirm'));
+		common_password('newpassword', _t('New password'),
+						_t('6 or more characters'));
+		common_password('confirm', _t('Confirm'),
+						_t('same as password above'));
 		common_submit('submit', _t('Change'));
 		common_element_end('form');
 		common_show_footer();
@@ -69,7 +75,7 @@ class PasswordAction extends SettingsAction {
 			$this->show_form(_t('Error saving user; invalid.'));
 			return;
 		}
-		
+
 		if (!$user->update($original)) {
 			common_server_error(_t('Can\'t save new password.'));
 			return;