From: nicolasconnault <nicolasconnault>
Date: Tue, 18 Aug 2009 05:00:49 +0000 (+0000)
Subject: MDL-19800 Upgraded calls to helpbutton, print_simple_box* and notify
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=c72e53f203c4bec2b5f61c83f20f2edb627d1487;p=moodle.git

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

diff --git a/login/change_password.php b/login/change_password.php
index 4e688c190a..149968172e 100644
--- 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 50ad0985ef..624d5cc342 100644
--- 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 012075adf0..f2ab0de95e 100644
--- 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 eefe33c952..5faf587a10 100644
--- 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();
 
 ?>