Fixed up various language strings to do with WR647

htdocs/index.php

@@ -44,11 +44,11 @@ if (!$USER->is_logged_in()) {
         'elements'   => array(
             'login' => array(
                 'type'   => 'fieldset',
-                'legend' => get_string('login'),
+                'legend' => get_string('logon'),
                 'elements' => array(
                     'login_username' => array(
                         'type'        => 'text',
-                        'title'       => get_string('username'),
+                        'title'       => get_string('username') . ':',
                         'description' => get_string('usernamedescription'),
                         'rules' => array(
                             'required'    => true
@@ -56,7 +56,7 @@ if (!$USER->is_logged_in()) {
                     ),
                     'login_password' => array(
                         'type'        => 'password',
-                        'title'       => get_string('password'),
+                        'title'       => get_string('password') . ':',
                         'description' => get_string('passworddescription'),
                         'value'       => '',
                         'rules' => array(
@@ -65,7 +65,7 @@ if (!$USER->is_logged_in()) {
                     ),
                     'login_institution' => array(
                         'type' => 'select',
-                        'title' => get_string('institution'),
+                        'title' => get_string('institution') . ':',
                         'defaultvalue' => get_cookie('institution'),
                         'options' => $institutions,
                         'rules' => array(
@@ -81,8 +81,8 @@ if (!$USER->is_logged_in()) {
                 'value' => get_string('login')
             ),
             'register' => array(
-                'value' => '<div><a href="' . get_config('wwwroot') . 'register.php">' . get_string('register') . '</a> '
-                    . '| <a href="' . get_config('wwwroot') . 'forgotpass.php">' . get_string('forgotpassword') . '</a></div>'
+                'value' => '<div><a href="' . get_config('wwwroot') . 'register.php">' . get_string('register') . '</a>'
+                    . '<br><a href="' . get_config('wwwroot') . 'forgotpass.php">' . get_string('passwordreminder') . '</a></div>'
             )
         )
     )));

htdocs/lang/en.utf8/mahara.php

@@ -57,6 +57,7 @@ $string['institution'] = 'Institution';
 $string['institutiondescription'] = 'Your institution';
 $string['loggedoutok'] = 'You have been logged out successfully';
 $string['login'] = 'Log In';
+$string['logon'] = 'Log On';
 $string['loginfailed'] = 'You have not provided the correct credentials to log in. Please check your username and password are correct.';
 $string['loginto'] = 'Log in to %s';
 $string['newpassword'] = 'New Password';
@@ -91,6 +92,7 @@ $string['registeringdisallowed'] = 'Sorry, you cannot register for this system a
 // Forgot password
 $string['cantchangepassword'] = 'Sorry, you are unable to change your password through this interface - please use your institution\'s interface instead';
 $string['forgotpassword'] = 'Forgotten your password?';
+$string['passwordreminder'] = 'Password Reminder';
 $string['pwchangerequestsent'] = 'You should receive an e-mail shortly with a link you can use to change the password for your account';
 $string['forgotpassemailsubject'] = 'Change password request for %s';
 $string['forgotpassemailmessagetext'] = 'Dear %s,
@@ -127,7 +129,7 @@ $string['forgotpassemailmessagehtml'] = '<p>Dear %s,</p>
 
 <p><a href="' . get_config('wwwroot') . 'forgotpass.php?key=%s">' . get_config('wwwroot') . 'forgotpass.php?key=%s</a></p>';
 $string['forgotpassemailsendunsuccessful'] = 'Sorry, it appears that the e-mail could not be sent successfully. This is our fault, please try again shortly';
-$string['forgotpassnosuchemailaddress'] = 'Sorry, this e-mail address does not appear to have an account here';
+$string['forgotpassnosuchemailaddress'] = 'Invalid email address entered';
 $string['nosuchpasswordrequest'] = 'No such password request';
 $string['passwordchangedok'] = 'Your password was successfully changed';
 

htdocs/register.php

@@ -26,6 +26,7 @@
 
 define('INTERNAL', 1);
 define('PUBLIC', 1);
+define('MENUITEM', 'home');
 require('init.php');
 
 /*

htdocs/theme/default/templates/register.tpl

 {include file="header.tpl"}
 
+<div class="sidebar"><a href="{$WWWROOT}forgotpass.php">{str tag=forgotpassword}</a></div>
+
+{include file="adminmenu.tpl"}
+
 <h2>{str tag=register}</h2>
 
 {if $register_form}