Merge branch 'MDL-35817' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 20 Jan 2013 20:47:00 +0000 (09:47 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 20 Jan 2013 20:47:00 +0000 (09:47 +1300)
lib/javascript-static.js
login/index.php
login/index_form.html

index 6572ecd..2a5712e 100644 (file)
@@ -854,6 +854,16 @@ M.util.focus_login_form = function(Y) {
     }
 }
 
+/**
+ * Set focus on login error message
+ */
+M.util.focus_login_error = function(Y) {
+    var errorlog = Y.one('#loginerrormessage');
+
+    if (errorlog) {
+        errorlog.focus();
+    }
+}
 /**
  * Adds lightbox hidden element that covers the whole node.
  *
index cd3b558..fde60a4 100644 (file)
@@ -341,7 +341,9 @@ if (isloggedin() and !isguestuser()) {
     echo $OUTPUT->box_end();
 } else {
     include("index_form.html");
-    if (!empty($CFG->loginpageautofocus)) {
+    if ($errormsg) {
+        $PAGE->requires->js_init_call('M.util.focus_login_error', null, true);
+    } else if (!empty($CFG->loginpageautofocus)) {
         //focus username or password
         $PAGE->requires->js_init_call('M.util.focus_login_form', null, true);
     }
index 5c9f34d..c5f75e8 100644 (file)
@@ -30,9 +30,10 @@ if (!empty($CFG->loginpasswordautocomplete)) {
         </div>
         <?php
           if (!empty($errormsg)) {
-              echo '<div class="loginerrors">';
+              echo html_writer::start_tag('div', array('class' => 'loginerrors'));
+              echo html_writer::link('#', $errormsg, array('id' => 'loginerrormessage', 'class' => 'accesshide'));
               echo $OUTPUT->error_text($errormsg);
-              echo '</div>';
+              echo html_writer::end_tag('div');
           }
         ?>
         <form action="<?php echo $CFG->httpswwwroot; ?>/login/index.php" method="post" id="login" <?php echo $autocomplete; ?> >