From 85db96c5b485cf3637f1c185ec1736297702a1f3 Mon Sep 17 00:00:00 2001
From: dongsheng <dongsheng>
Date: Wed, 10 Dec 2008 06:48:54 +0000
Subject: [PATCH] "MDL-17570, cleanup align property in div, merged from 1.9"

---
 admin/lang.php                              | 2 +-
 admin/replace.php                           | 2 +-
 course/format/topics/format.php             | 2 +-
 course/format/weeks/format.php              | 2 +-
 enrol/paypal/enrol.php                      | 2 +-
 message/lib.php                             | 2 +-
 mod/data/lib.php                            | 2 +-
 mod/forum/lib.php                           | 2 +-
 mod/hotpot/index.php                        | 2 +-
 mod/hotpot/view.php                         | 4 ++--
 mod/lesson/highscores.php                   | 4 ++--
 mod/resource/type/file/localfile.php        | 2 +-
 mod/resource/type/file/localpath.php        | 4 ++--
 mod/scorm/report.php                        | 4 ++--
 mod/wiki/ewiki/plugins/moodle/downloads.php | 2 +-
 search/query.php                            | 7 +++----
 search/querylib.php                         | 4 ++--
 theme/standard/styles_layout.css            | 2 ++
 18 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/admin/lang.php b/admin/lang.php
index 724b93d56ee..a89839326a0 100644
--- a/admin/lang.php
+++ b/admin/lang.php
@@ -830,7 +830,7 @@
                     echo ($filetemplate);
                 }
                 echo "</textarea>\n</div>\n";
-                echo '<div align="center"><input type="submit" value="'.get_string('savechanges').'" /></div>';
+                echo '<div class="mdl-align"><input type="submit" value="'.get_string('savechanges').'" /></div>';
                 echo '</form>';
                 $preview_url = lang_help_preview_url($currentfile, !$uselocal);
                 if ($preview_url) {
diff --git a/admin/replace.php b/admin/replace.php
index 4e8df42be21..cd1ffb74af1 100644
--- a/admin/replace.php
+++ b/admin/replace.php
@@ -19,7 +19,7 @@ print_heading('Search and replace text throughout the whole database');
 if (!data_submitted() or !$search or !$replace or !confirm_sesskey()) {   /// Print a form
 
     print_simple_box_start('center');
-    echo '<div align="center">';
+    echo '<div class="mdl-align">';
     echo '<form action="replace.php" method="post">';
     echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
     echo 'Search whole database for: <input type="text" name="search" /><br />';
diff --git a/course/format/topics/format.php b/course/format/topics/format.php
index 9d91e5e1ea8..fe8cb39f5f1 100644
--- a/course/format/topics/format.php
+++ b/course/format/topics/format.php
@@ -283,7 +283,7 @@
     echo "</ul>\n";
 
     if (!empty($sectionmenu)) {
-        echo '<div align="center" class="jumpmenu">';
+        echo '<div class="jumpmenu">';
         echo popup_form($CFG->wwwroot.'/course/view.php?id='.$course->id.'&amp;', $sectionmenu,
                    'sectionmenu', '', get_string('jumpto'), '', '', true);
         echo '</div>';
diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php
index 674ff48fbd5..d000213d231 100644
--- a/course/format/weeks/format.php
+++ b/course/format/weeks/format.php
@@ -274,7 +274,7 @@
     echo "</ul>\n";
 
     if (!empty($sectionmenu)) {
-        echo '<div align="center" class="jumpmenu">';
+        echo '<div class="jumpmenu">';
         echo popup_form($CFG->wwwroot.'/course/view.php?id='.$course->id.'&amp;', $sectionmenu,
                    'sectionmenu', '', get_string('jumpto'), '', '', true);
         echo '</div>';
diff --git a/enrol/paypal/enrol.php b/enrol/paypal/enrol.php
index 7cba406e955..f3851d0000d 100644
--- a/enrol/paypal/enrol.php
+++ b/enrol/paypal/enrol.php
@@ -51,7 +51,7 @@ function print_entry($course) {
                 // in unencrypted connection...
                 $wwwroot = str_replace("http://", "https://", $CFG->wwwroot);
             }
-            echo '<div align="center"><p>'.get_string('paymentrequired').'</p>';
+            echo '<div class="mdl-align"><p>'.get_string('paymentrequired').'</p>';
             echo '<p><b>'.get_string('cost').": $CFG->enrol_currency $cost".'</b></p>';
             echo '<p><a href="'.$wwwroot.'/login/">'.get_string('loginsite').'</a></p>';
             echo '</div>';
diff --git a/message/lib.php b/message/lib.php
index 4e97406cceb..89d8b5f7072 100644
--- a/message/lib.php
+++ b/message/lib.php
@@ -295,7 +295,7 @@ function message_get_contact($contactid) {
 function message_print_search_results($frm) {
     global $USER, $CFG, $DB;
 
-    echo '<div align="center">';
+    echo '<div class="mdl-align">';
 
     /// search for person
     if (!empty($frm->personsubmit) and !empty($frm->name)) {
diff --git a/mod/data/lib.php b/mod/data/lib.php
index 5af8222b20b..943902111ef 100755
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -227,7 +227,7 @@ class data_field_base {     // Base class for Database Field Types (see field/*/
 
         require_once($CFG->dirroot.'/mod/data/field/'.$this->type.'/mod.html');
 
-        echo '<div align="center">';
+        echo '<div class="mdl-align">';
         echo '<input type="submit" value="'.$savebutton.'" />'."\n";
         echo '<input type="submit" name="cancel" value="'.get_string('cancel').'" />'."\n";
         echo '</div>';
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 90222060531..d367114b467 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -1017,7 +1017,7 @@ function forum_make_mail_html($course, $cm, $forum, $discussion, $post, $userfro
     $posthtml .= forum_make_mail_post($course, $cm, $forum, $discussion, $post, $userfrom, $userto, false, $canreply, true, false);
 
     if ($canunsubscribe) {
-        $posthtml .= '<hr /><div align="center" class="unsubscribelink">
+        $posthtml .= '<hr /><div class="mdl-align unsubscribelink">
                       <a href="'.$CFG->wwwroot.'/mod/forum/subscribe.php?id='.$forum->id.'">'.get_string('unsubscribe', 'forum').'</a>&nbsp;
                       <a href="'.$CFG->wwwroot.'/mod/forum/unsubscribeall.php">'.get_string('unsubscribeall', 'forum').'</a></div>';
     }
diff --git a/mod/hotpot/index.php b/mod/hotpot/index.php
index 70934fad3fe..5b06c525498 100644
--- a/mod/hotpot/index.php
+++ b/mod/hotpot/index.php
@@ -114,7 +114,7 @@
                     print '</ul>';
                 }
                 print ''
-                .   '<div align="center"><table border="0"><tr><td>'
+                .   '<div class="mdl-align"><table border="0"><tr><td>'
                 .   '<form target="_parent" method="post" action="'.$ME.'">'
                 .   '<input type="hidden" name="id" value="'.$course->id.'" />'
                 .   '<input type="hidden" name="regrade" value="'.$regrade.'" />'
diff --git a/mod/hotpot/view.php b/mod/hotpot/view.php
index 367da2a8f81..2136d272fde 100644
--- a/mod/hotpot/view.php
+++ b/mod/hotpot/view.php
@@ -71,13 +71,13 @@
             $boxwidth = 500;
             if (trim(strip_tags($hotpot->summary))) {
                 print_simple_box_start($boxalign, $boxwidth);
-                print '<div align="center">'.format_text($hotpot->summary)."</div>\n";
+                print '<div class="mdl-align">'.format_text($hotpot->summary)."</div>\n";
                 print_simple_box_end();
                 print "<br />\n";
             }
             print '<form id="passwordform" method="post" action="view.php?id='.$cm->id.'">'."\n";
             print_simple_box_start($boxalign, $boxwidth);
-            print '<div align="center">';
+            print '<div class="mdl-align">';
             print get_string('requirepasswordmessage', 'quiz').'<br /><br />';
             print '<b>'.get_string('password').':</b> ';
             print '<input name="hppassword" type="password" value="" /> ';
diff --git a/mod/lesson/highscores.php b/mod/lesson/highscores.php
index abce2e24048..d2ba6a4780b 100644
--- a/mod/lesson/highscores.php
+++ b/mod/lesson/highscores.php
@@ -139,7 +139,7 @@
     switch ($mode) {
         case 'add':
             print_simple_box_start('center');
-            echo '<div align="center">
+            echo '<div class="mdl-align">
                  <form id="nickname" method ="post" action="'.$CFG->wwwroot.'/mod/lesson/highscores.php" autocomplete="off">
                  <input type="hidden" name="id" value="'.$cm->id.'" />
                  <input type="hidden" name="mode" value="save" />
@@ -194,7 +194,7 @@
             }
         
             if (!has_capability('mod/lesson:manage', $context)) {  // teachers don't need the links
-                echo '<div align="center">';
+                echo '<div class="mdl-align">';
                 if ($link) {
                     echo "<br /><div class=\"lessonbutton standardbutton\"><a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">".get_string("returntocourse", "lesson")."</a></div>";
                 } else {
diff --git a/mod/resource/type/file/localfile.php b/mod/resource/type/file/localfile.php
index c3bfdf5b64c..4bb560c5c60 100644
--- a/mod/resource/type/file/localfile.php
+++ b/mod/resource/type/file/localfile.php
@@ -33,7 +33,7 @@
     </script>
     
     <br />
-    <div align="center" class="form">
+    <div class="mdl-align form">
     <form id="myform">
     <fieldset class="invisiblefieldset">
     <input type="file" size="60" name="myfile" /><br />
diff --git a/mod/resource/type/file/localpath.php b/mod/resource/type/file/localpath.php
index 7b2473998a9..31d99455550 100644
--- a/mod/resource/type/file/localpath.php
+++ b/mod/resource/type/file/localpath.php
@@ -39,7 +39,7 @@
     </script>
     
     <br />
-    <div align="center" class="form">
+    <div class="mdl-align form">
     <form id="myform" action="localpath.php" method="post">
     <fieldset class="invisiblefieldset">
     <input type="hidden" name="sesskey" value="<?php echo sesskey(); ?>">
@@ -54,4 +54,4 @@
     </div>
 <?php
     print_footer('empty');
-?>
\ No newline at end of file
+?>
diff --git a/mod/scorm/report.php b/mod/scorm/report.php
index 02155de764c..e3a6ec19995 100755
--- a/mod/scorm/report.php
+++ b/mod/scorm/report.php
@@ -220,7 +220,7 @@
                 if ($scoes = $DB->get_records_select('scorm_scoes',"scorm=? ORDER BY id", array($scorm->id))) {
                     if (!empty($userdata)) {
                         print_simple_box_start('center');
-                        echo '<div align="center">'."\n";
+                        echo '<div class="mdl-align">'."\n";
                         print_user_picture($user, $course->id, $userdata->picture, false, false);
                         echo "<a href=\"$CFG->wwwroot/user/view.php?id=$user&amp;course=$course->id\">".
                              "$userdata->firstname $userdata->lastname</a><br />";
@@ -282,7 +282,7 @@
             print_simple_box_start('center');
             //print_heading(format_string($sco->title));
             print_heading('<a href="'.$CFG->wwwroot.'/mod/scorm/player.php?a='.$scorm->id.'&amp;mode=browse&amp;scoid='.$sco->id.'" target="_new">'.format_string($sco->title).'</a>');
-            echo '<div align="center">'."\n";
+            echo '<div class="mdl-align">'."\n";
             print_user_picture($user, $course->id, $userdata->picture, false, false);
             echo "<a href=\"$CFG->wwwroot/user/view.php?id=$user&amp;course=$course->id\">".
                  "$userdata->firstname $userdata->lastname</a><br />";
diff --git a/mod/wiki/ewiki/plugins/moodle/downloads.php b/mod/wiki/ewiki/plugins/moodle/downloads.php
index 56980628825..06504bd6fe6 100644
--- a/mod/wiki/ewiki/plugins/moodle/downloads.php
+++ b/mod/wiki/ewiki/plugins/moodle/downloads.php
@@ -216,7 +216,7 @@ function ewiki_page_filedownload($id, $data, $action, $def_sec="") {
                "orderby"=>$orderby, "section" => $sec)) .
                '">' . $title . "</a>";
          }
-         $o .= '<div align="center" class="darker">'.implode(" &middot; ", $oa).'</div><br />';
+         $o .= '<div class="mdl-align darker">'.implode(" &middot; ", $oa).'</div><br />';
       }
    }
 
diff --git a/search/query.php b/search/query.php
index 71e99af8f0b..a073554e3a8 100644
--- a/search/query.php
+++ b/search/query.php
@@ -274,8 +274,7 @@
     ?>
     </form>
     <br/>
-
-    <div align="center">
+    <div class="mdl-align">
     <?php
     print_string('searching', 'search') . ': ';
 
@@ -365,8 +364,8 @@
         }
         print_box_end();
     ?>
-    <div align="center">
-    <?php
+    <div class="mdl-align">
+    <?php 
         print_string('ittook', 'search');
         search_stopwatch();
         print_string('tofetchtheseresults', 'search');
diff --git a/search/querylib.php b/search/querylib.php
index 7db4eef9ab4..ddb1fe59dda 100644
--- a/search/querylib.php
+++ b/search/querylib.php
@@ -326,7 +326,7 @@ class SearchQuery {
       $next   = get_string('next', 'search');
       $back   = get_string('back', 'search');
 
-      $ret = "<div align='center' id='search_page_links'>";
+      $ret = "<div class='mdl-align' id='search_page_links'>";
 
       //Back is disabled if we're on page 1
       if ($page > 1) {
@@ -487,4 +487,4 @@ class SearchQuery {
       return $this->results_per_page;
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 64da00c54c8..e6b591296e3 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -2431,6 +2431,8 @@ body#course-info .generalbox.info {
   text-align:center;
 }
 
+.jumpmenu {text-align:center}
+
 /***
  *** Group
  ***/