MDL-19800 Upgraded calls to helpbutton, print_simple_box* and notify

diff --git a/login/change_password.php b/login/change_password.php
index 4e688c190aaa224dc53eeca7185238922c88d511..149968172e63bae74a0a1eee87369e7baa52a475 100644 (file)
--- a/login/change_password.php
+++ b/login/change_password.php
@@ -109,7 +109,7 @@
 
     print_header($strchangepassword, $strchangepassword, $navigation);
     if (get_user_preferences('auth_forcepasswordchange')) {
-        notify(get_string('forcepasswordchangenotice'));
+        echo $OUTPUT->notification(get_string('forcepasswordchangenotice'));
     }
     $mform->display();
     echo $OUTPUT->footer();

diff --git a/login/index.php b/login/index.php
index 50ad0985ef8450216fd1afee45e6d9c2ac2d498b..624d5cc34240987126b684457a095fd00cb6a48e 100644 (file)
--- a/login/index.php
+++ b/login/index.php
@@ -129,7 +129,7 @@
             if (empty($user->confirmed)) {       // This account was never confirmed
                 print_header(get_string("mustconfirm"), get_string("mustconfirm") );
                 echo $OUTPUT->heading(get_string("mustconfirm"));
-                print_simple_box(get_string("emailconfirmsent", "", $user->email), "center");
+                echo $OUTPUT->box(get_string("emailconfirmsent", "", $user->email), "generalbox boxaligncenter");
                 echo $OUTPUT->footer();
                 die;
             }

diff --git a/login/index_form.html b/login/index_form.html
index 012075adf0e41592bee6a133130aab19dd305da5..f2ab0de95e8599df27a47bb98a3443572634d568 100644 (file)
--- a/login/index_form.html
+++ b/login/index_form.html
@@ -15,7 +15,7 @@ if ($show_instructions) {
             if (empty($CFG->usesid)) {
                 echo '<br/>';
                 echo '('.get_string("cookiesenabled").')';
-                helpbutton("cookies", get_string("cookiesenabled"));
+                echo $OUTPUT->help_icon(moodle_help_icon::make("cookies", get_string("cookiesenabled")));
             }
            ?>
         </div>

diff --git a/login/mnet_email.php b/login/mnet_email.php
index eefe33c952a3e7e82d1a4bd45f1f72b908748564..5faf587a109f483e52bc0b5d758dc753cccb140e 100644 (file)
--- a/login/mnet_email.php
+++ b/login/mnet_email.php
@@ -23,7 +23,7 @@ if ($form = data_submitted() and confirm_sesskey()) {
 }
 
 echo '<p>&nbsp;</p>';
-print_simple_box_start('center','50%','','20');
+echo $OUTPUT->box_start('generalbox boxaligncenter boxwidthnormal');
 
 ?>
   <form method="post">
@@ -34,7 +34,7 @@ print_simple_box_start('center','50%','','20');
   </form>
 <?php
 
-print_simple_box_end();
+echo $OUTPUT->box_end();
 echo $OUTPUT->footer();
 
 ?>