Integrate account help into menu

diff --git a/PciIds/Html/Users.pm b/PciIds/Html/Users.pm
index 8cab64e11661b25faa301137852cdfe8aeccb760..503bbc422529e556eb257457c5302e04ba12959c 100644 (file)
--- 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 '<h1>Register a new user</h1>';
-       genLocMenu( $req, $args, [ [ 'Log in', 'login' ] ] );
+       genLocMenu( $req, $args, [ [ 'Log in', 'login' ], [ 'Help', 'help', 'account' ] ] );
        print '<div class="error">'.$error.'</div>' if( defined $error );
        print '<form name="register" id="register" method="POST" action="">
                <table>';
@@ -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 "<h1>Registration email sent</h1>\n";
-       genLocMenu( $req, $args, [ [ 'Log in', 'login' ] ] );
+       genLocMenu( $req, $args, [ [ 'Log in', 'login' ], [ 'Help', 'help', 'account' ] ] );
        print '<p>
                        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 '<h1>Confirm registration</h1>';
-       genLocMenu( $req, $args, [ [ 'Register', 'register' ] ] );
+       genLocMenu( $req, $args, [ [ 'Register', 'register' ], [ 'Help', 'help', 'account' ] ] );
        print '<div class="error">'.$error.'</div>' if( defined $error );
        print '<p>Email address: '.encode( $values->{'email'} );
        print '<form name="register-confirm" id="register-confirm" method="POST" action="">';
@@ -94,7 +94,7 @@ sub usedAddress( $$ ) {
        my( $req, $args ) = @_;
        genHtmlHead( $req, 'Used address', undef );
        print "<h1>Used address</h1>\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 '<div class="error">
                <p>
                        An account for this address is already registered.
@@ -163,7 +163,7 @@ sub confirmSubmit( $$$ ) {
        }
        genHtmlHead( $req, 'Registered', undef );
        print "<h1>Registered</h1>\n";
-       genLocMenu( $req, $args, [ [ 'Log in', 'login' ] ] );
+       genLocMenu( $req, $args, [ [ 'Log in', 'login' ], [ 'Help', 'help', 'account' ] ] );
        print '<p>
                        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 '<h1>Login</h1>';
-       genLocMenu( $req, $args, [ [ 'Register', 'register' ], [ 'Reset password', 'respass' ] ] );
+       genLocMenu( $req, $args, [ [ 'Register', 'register' ], [ 'Reset password', 'respass' ], [ 'Help', 'help', 'account' ] ] );
        print '<div class="error"><p>'.$error.'</div>' if( defined $error );
        print '<form name="login" id="login" method="POST" action="'.setAddrPrefix( $req->uri(), 'mods' ).buildExcept( 'action', $args ).'?action=login"><table>';
        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 "<h1>Reset password</h1>\n";
-       genLocMenu( $req, $args, [ [ 'Log in', 'login' ], [ 'Register', 'register' ] ] );
+       genLocMenu( $req, $args, [ [ 'Log in', 'login' ], [ 'Register', 'register' ], [ 'Help', 'help', 'account' ] ] );
        print "<p>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 '<div class="error">'.$error.'</div>' 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 "<h1>Reset password</h1>\n";
-               genLocMenu( $req, $args, [ [ 'Log in', 'login' ] ] );
+               genLocMenu( $req, $args, [ [ 'Log in', 'login' ], [ 'Help', 'help', 'account' ] ] );
                print "<p>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 "<h1>Reset password</h1>\n";
-       genLocMenu( $req, $args, [ [ 'Log in', 'login' ] ] );
+       genLocMenu( $req, $args, [ [ 'Log in', 'login' ], [ 'Help', 'help', 'account' ] ] );
        print '<div class="error">'.$error.'</div>' if( defined $error );
        print "<p>You can enter new password here:\n";
        print '<form name="respass-confirm" id="respass-confirm" method="POST" action="">
@@ -357,7 +357,7 @@ sub resetPasswdConfirmFormSubmit( $$$ ) {
                        changePasswd( $tables, $id, $data->{'password'}, $email );
                        genHtmlHead( $req, 'Reset password', undef );
                        print "<h1>Reset password</h1>\n";
-                       genLocMenu( $req, $args, [ [ 'Log in', 'login' ] ] );
+                       genLocMenu( $req, $args, [ [ 'Log in', 'login' ], [ 'Help', 'help', 'account' ] ] );
                        print "<p>Your password was successfuly changed.\n";
                        genHtmlTail();
                        return OK;

diff --git a/help/account b/help/account
index e3946b0dc59a14c09296b3d2352b2291f5b1a448..237fd62bee78984fb20f863b3dd84810bdfcb406 100644 (file)
--- 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 <a href='$AC_URL$respass'>reset your password</a> (because exists no password for you).
 <p>
-If you do not have an account, go to <a href='$AC_URL$register'>Register</a> item in menu (you can find it, when you visit <a href='$AC_URL$login'>Log in</a> page) and fill your email address.
+If you do not have an account, go to <a href='$AC_URL$register'>register</a> item in menu (you can find it, when you visit <a href='$AC_URL$login'>Log in</a> 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.