Permalink
Browse files

Merge branch 'MDL-35817_m24' of git://github.com/rwijaya/moodle into …

…MOODLE_24_STABLE
  • Loading branch information...
2 parents c5d97a9 + 6b519ea commit 9afa0e696ea722ce87ff4b5e56eedc6479f0c755 Sam Hemelryk committed Jan 20, 2013
Showing with 16 additions and 3 deletions.
  1. +10 −0 lib/javascript-static.js
  2. +3 −1 login/index.php
  3. +3 −2 login/index_form.html
View
@@ -855,6 +855,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.
*
* @param {YUI} Y
View
@@ -345,7 +345,9 @@
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);
}
View
@@ -30,9 +30,10 @@
</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; ?> >

0 comments on commit 9afa0e6

Please sign in to comment.