From 8b4a613e8537f68427b47fb7d4d53b7205bf00b2 Mon Sep 17 00:00:00 2001 From: Michal Vaner Date: Sat, 30 Aug 2008 15:32:28 +0200 Subject: [PATCH] Integrate account help into menu --- PciIds/Html/Users.pm | 20 ++++++++++---------- help/account | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/PciIds/Html/Users.pm b/PciIds/Html/Users.pm index 8cab64e..503bbc4 100644 --- a/PciIds/Html/Users.pm +++ b/PciIds/Html/Users.pm @@ -20,7 +20,7 @@ sub genRegisterForm( $$$$ ) { my( $req, $args, $error, $values ) = @_; genHtmlHead( $req, 'Register a new user', undef ); print '

Register a new user

'; - genLocMenu( $req, $args, [ [ 'Log in', 'login' ] ] ); + genLocMenu( $req, $args, [ [ 'Log in', 'login' ], [ 'Help', 'help', 'account' ] ] ); print '
'.$error.'
' if( defined $error ); print '
'; @@ -63,7 +63,7 @@ sub registerSubmit( $$$ ) {#A registration form has been submited "\n(This is an autogenerated email, do not respond to it)" ); genHtmlHead( $req, 'Registration email sent', undef ); print "

Registration email sent

\n"; - genLocMenu( $req, $args, [ [ 'Log in', 'login' ] ] ); + genLocMenu( $req, $args, [ [ 'Log in', 'login' ], [ 'Help', 'help', 'account' ] ] ); print '

An email containing further information has been sent to you. Please follow these instruction to finish the registration process.'; @@ -75,7 +75,7 @@ sub genConfirmForm( $$$$ ) { my( $req, $args, $error, $values ) = @_; genHtmlHead( $req, 'Confirm registration', undef ); print '

Confirm registration

'; - genLocMenu( $req, $args, [ [ 'Register', 'register' ] ] ); + genLocMenu( $req, $args, [ [ 'Register', 'register' ], [ 'Help', 'help', 'account' ] ] ); print '
'.$error.'
' if( defined $error ); print '

Email address: '.encode( $values->{'email'} ); print ''; @@ -94,7 +94,7 @@ sub usedAddress( $$ ) { my( $req, $args ) = @_; genHtmlHead( $req, 'Used address', undef ); print "

Used address

\n"; - genLocMenu( $req, $args, [ [ 'Log in', 'login' ], [ 'Reset password', 'respass' ], [ 'Register', 'register' ] ] ); + genLocMenu( $req, $args, [ [ 'Log in', 'login' ], [ 'Reset password', 'respass' ], [ 'Register', 'register' ], [ 'Help', 'help', 'account' ] ] ); print '

An account for this address is already registered. @@ -163,7 +163,7 @@ sub confirmSubmit( $$$ ) { } genHtmlHead( $req, 'Registered', undef ); print "

Registered

\n"; - genLocMenu( $req, $args, [ [ 'Log in', 'login' ] ] ); + genLocMenu( $req, $args, [ [ 'Log in', 'login' ], [ 'Help', 'help', 'account' ] ] ); print '

You have registered successfully.'; genHtmlTail(); @@ -175,7 +175,7 @@ sub genLoginForm( $$$$ ) { $req->headers_out->add( 'Set-Cookie' => new CGI::Cookie( -name => 'cookie-test', -value => 1 ) ); genHtmlHead( $req, 'Login', undef ); print '

Login

'; - genLocMenu( $req, $args, [ [ 'Register', 'register' ], [ 'Reset password', 'respass' ] ] ); + genLocMenu( $req, $args, [ [ 'Register', 'register' ], [ 'Reset password', 'respass' ], [ 'Help', 'help', 'account' ] ] ); print '

'.$error.'

' if( defined $error ); print '
'; genForm( [ [ 'Login name or email:', 'text', 'login', 'maxlength="255"' ], @@ -253,7 +253,7 @@ sub genResetPasswdForm( $$$$ ) { my( $req, $args, $error, $values ) = @_; genHtmlHead( $req, 'Reset password', undef ); print "

Reset password

\n"; - genLocMenu( $req, $args, [ [ 'Log in', 'login' ], [ 'Register', 'register' ] ] ); + genLocMenu( $req, $args, [ [ 'Log in', 'login' ], [ 'Register', 'register' ], [ 'Help', 'help', 'account' ] ] ); print "

If you forgot your password (or didn't create one yet), you can reset it to a new value here.\n"; print "Provide your email address here and further instructions will be sent to you.\n"; print '

'.$error.'
' if( defined $error ); @@ -290,7 +290,7 @@ sub resetPasswdFormSubmit( $$$ ) { "\n(This is an autogenerated email, do not respond to it)" ); genHtmlHead( $req, 'Reset password', undef ); print "

Reset password

\n"; - genLocMenu( $req, $args, [ [ 'Log in', 'login' ] ] ); + genLocMenu( $req, $args, [ [ 'Log in', 'login' ], [ 'Help', 'help', 'account' ] ] ); print "

An email with information has been sent to your address.\n"; genHtmlTail(); return OK; @@ -304,7 +304,7 @@ sub genResetPasswdConfigForm( $$$$$$ ) { my( $req, $args, $error, $values, $email, $hash ) = @_; genHtmlHead( $req, 'Reset password', undef ); print "

Reset password

\n"; - genLocMenu( $req, $args, [ [ 'Log in', 'login' ] ] ); + genLocMenu( $req, $args, [ [ 'Log in', 'login' ], [ 'Help', 'help', 'account' ] ] ); print '
'.$error.'
' if( defined $error ); print "

You can enter new password here:\n"; print ' @@ -357,7 +357,7 @@ sub resetPasswdConfirmFormSubmit( $$$ ) { changePasswd( $tables, $id, $data->{'password'}, $email ); genHtmlHead( $req, 'Reset password', undef ); print "

Reset password

\n"; - genLocMenu( $req, $args, [ [ 'Log in', 'login' ] ] ); + genLocMenu( $req, $args, [ [ 'Log in', 'login' ], [ 'Help', 'help', 'account' ] ] ); print "

Your password was successfuly changed.\n"; genHtmlTail(); return OK; diff --git a/help/account b/help/account index e3946b0..237fd62 100644 --- a/help/account +++ b/help/account @@ -20,7 +20,7 @@ It is created if you submit something using email. And we created accounts for all submits imported from previous version of this site. In that case, you need to reset your password (because exists no password for you).

-If you do not have an account, go to Register item in menu (you can find it, when you visit Log in page) and fill your email address. +If you do not have an account, go to register item in menu (you can find it, when you visit Log in page) and fill your email address. A message containing confirmation link will be sent to it. After you follow the link and fill in the rest, your account is ready for use. -- 2.39.2