From: dongsheng <dongsheng>
Date: Wed, 10 Dec 2008 07:24:11 +0000 (+0000)
Subject: "MDL-17570,clean align property, merged from 1.9"
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ff9b4ea40aeac665387e155981e5a343cac1b741;p=moodle.git

"MDL-17570,clean align property, merged from 1.9"
---

diff --git a/admin/lang.php b/admin/lang.php
index a89839326a..abb1ed2389 100644
--- a/admin/lang.php
+++ b/admin/lang.php
@@ -822,7 +822,7 @@
                 echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
                 echo '<input type="hidden" name="currentfile" value="'.$currentfile.'" />';
                 echo '<input type="hidden" name="mode" value="helpfiles" />';
-                echo "<div align=\"center\">\n";
+                echo "<div class='mdl-align'>\n";
                 echo "<textarea rows=\"$fileeditorrows\" cols=\"$fileeditorcols\" name=\"filedata\">";
                 if (file_exists("$saveto/$currentfile")) {
                     echo htmlspecialchars(file_get_contents("$saveto/$currentfile"));
@@ -842,7 +842,7 @@
             if (is_readable("$altdir/$currentfile")) {
                 // show the content of the same help file in alternative location
                 echo '<fieldset><legend>'.$straltdirtitle.'</legend>';
-                echo "<div align=\"center\">\n";
+                echo "<div class='mdl-align'>\n";
                 echo "<textarea rows=\"$fileeditorrows\" cols=\"$fileeditorcols\" name=\"\">";
                 if (file_exists("$altdir/$currentfile")) {
                     echo htmlspecialchars(file_get_contents("$altdir/$currentfile"));
@@ -869,7 +869,7 @@
                 echo '<fieldset><legend>'.$strlangmasterenglish;
                 helpbutton('langpackages', $strlangmasterenglish);
                 echo '</legend>';
-                echo "<div align=\"center\">\n<textarea rows=\"$fileeditorrows\" cols=\"$fileeditorcols\" name=\"\">";
+                echo "<div class='mdl-align'>\n<textarea rows=\"$fileeditorrows\" cols=\"$fileeditorcols\" name=\"\">";
                 echo htmlspecialchars(file_get_contents($ensrc));
                 echo "</textarea>\n</div>\n";
                 $preview_url = lang_help_preview_url($currentfile, true, 'en_utf8');   // do not display en_utf8_local
diff --git a/blog/rsslib.php b/blog/rsslib.php
index a0ad2dc09c..f688f7c100 100755
--- a/blog/rsslib.php
+++ b/blog/rsslib.php
@@ -40,7 +40,7 @@
 
         require_once($CFG->libdir.'/filelib.php');
         $path = get_file_url($path, null, 'rssfile');
-        print '<div align="right"><a href="'. $path .'"><img src="'. $rsspix .'" title="'. strip_tags($tooltiptext) .'" alt="'.get_string('rss').'" /></a></div>';
+        print '<div class="mdl-right"><a href="'. $path .'"><img src="'. $rsspix .'" title="'. strip_tags($tooltiptext) .'" alt="'.get_string('rss').'" /></a></div>';
 
     }
 
diff --git a/enrol/authorize/enrol.php b/enrol/authorize/enrol.php
index e50be2eaa3..30c622d3cb 100755
--- a/enrol/authorize/enrol.php
+++ b/enrol/authorize/enrol.php
@@ -71,7 +71,7 @@ class enrolment_plugin_authorize
 
         if ($USER->username == 'guest') { // only real guest user, not for users with guest role
             $curcost = get_course_cost($course);
-            echo '<div align="center">';
+            echo '<div class="mdl-align">';
             echo '<p>'.get_string('paymentrequired').'</p>';
             echo '<p><b>'.get_string('cost').": $curcost[currency] $curcost[cost]".'</b></p>';
             echo '<p><a href="'.$CFG->httpswwwroot.'/login/">'.get_string('loginsite').'</a></p>';
diff --git a/enrol/authorize/enrol_form.php b/enrol/authorize/enrol_form.php
index 77ec0234da..bf5c0fc4da 100755
--- a/enrol/authorize/enrol_form.php
+++ b/enrol/authorize/enrol_form.php
@@ -20,7 +20,7 @@ class enrol_authorize_form extends moodleform
         $mform->addElement('header', 'general', get_string('paymentrequired'));
         $othermethodstr = $this->other_method_available($paymentmethod);
         if ($othermethodstr) {
-            $mform->addElement('static', '', '<div align="right">' . $othermethodstr . '</div>', '');
+            $mform->addElement('static', '', '<div class="mdl-right">' . $othermethodstr . '</div>', '');
         }
 
         $mform->addElement('hidden', 'id', $course->id);
diff --git a/lib/adodb/adodb-perf.inc.php b/lib/adodb/adodb-perf.inc.php
index 50af6e3c5b..5f0e0a4875 100644
--- a/lib/adodb/adodb-perf.inc.php
+++ b/lib/adodb/adodb-perf.inc.php
@@ -751,7 +751,7 @@ Committed_AS:   348732 kB
 			echo $this->Tables(); break;
 		}
 		global $ADODB_vers;
-		echo "<p><div align=center><font size=1>$ADODB_vers Sponsored by <a href=http://phplens.com/>phpLens</a></font></div>";
+		echo "<p><div class='mdl-align'><font size=1>$ADODB_vers Sponsored by <a href=http://phplens.com/>phpLens</a></font></div>";
 	}
 	
 	/*
@@ -1085,4 +1085,4 @@ Committed_AS:   348732 kB
     // end hack 
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/mod/feedback/analysis.php b/mod/feedback/analysis.php
index 19bcd129d0..0684f3bc72 100644
--- a/mod/feedback/analysis.php
+++ b/mod/feedback/analysis.php
@@ -114,7 +114,7 @@
         }
 
         //button "export to excel"
-        //echo '<div align="center">';
+        //echo '<div class="mdl-align">';
         // echo '<div class="feedback_centered_button">';
         echo '<div class="form-buttons">';
         $export_button_link = 'analysis_to_excel.php';
@@ -148,7 +148,7 @@
             $check_anonymously = false;
         }
     }
-    // echo '<div align="center"><table width="80%" cellpadding="10"><tr><td>';
+    // echo '<div class="mdl-align"><table width="80%" cellpadding="10"><tr><td>';
     echo '<div><table width="80%" cellpadding="10"><tr><td>';
     if($check_anonymously) {
         $itemnr = 0;
diff --git a/mod/feedback/analysis_course.php b/mod/feedback/analysis_course.php
index 53fc288440..ddb31265ee 100644
--- a/mod/feedback/analysis_course.php
+++ b/mod/feedback/analysis_course.php
@@ -70,7 +70,7 @@
 
     if( $capabilities->viewreports ) {
         //button "export to excel"
-        echo '<div align="center">';
+        echo '<div class="mdl-align">';
         $export_button_link = 'analysis_to_excel.php';
         $export_button_options = array('sesskey'=>$USER->sesskey, 'id'=>$id, 'coursefilter'=>$coursefilter);
         $export_button_label = get_string('export_to_excel', 'feedback');
@@ -98,7 +98,7 @@
     }
 
     echo '<form name="report" method="post">';
-    echo '<div align="center"><table width="80%" cellpadding="10">';
+    echo '<div class="mdl-align"><table width="80%" cellpadding="10">';
     if ($courseitemfilter > 0) {
         $avgvalue = 'avg(value)';
         if ($DB->get_dbfamily() == 'postgres') { // TODO: this should be moved to standard sql DML function ;-)
diff --git a/mod/feedback/complete.php b/mod/feedback/complete.php
index 2d360fd4ad..b56d003467 100644
--- a/mod/feedback/complete.php
+++ b/mod/feedback/complete.php
@@ -282,7 +282,7 @@
     
         if( (intval($feedback->publish_stats) == 1) AND ( $capabilities->viewanalysepage) AND !( $capabilities->viewreports) ) {
             if($multiple_count = $DB->count_records('feedback_tracking', array('userid'=>$USER->id, 'feedback'=>$feedback->id))) {
-                echo '<div align="center"><a href="'.htmlspecialchars('analysis.php?id=' . $id . '&courseid='.$courseid).'">';
+                echo '<div class="mdl-align"><a href="'.htmlspecialchars('analysis.php?id=' . $id . '&courseid='.$courseid).'">';
                 echo get_string('completed_feedbacks', 'feedback').'</a>';
                 echo '</div>';
             }
@@ -334,7 +334,7 @@
             if(is_array($feedbackitems)){
                 // print_simple_box_start('center', '75%');
                 print_box_start('generalbox boxaligncenter boxwidthwide');
-                echo '<div align="center"><form name="frm" action="'.$ME.'" method="post" onsubmit=" ">';
+                echo '<div class="mdl-align"><form name="frm" action="'.$ME.'" method="post" onsubmit=" ">';
                 echo '<input type="hidden" name="sesskey" value="' . $USER->sesskey . '" />';
                 echo '<table>';
                 switch ($feedback->anonymous) {
diff --git a/mod/feedback/complete_guest.php b/mod/feedback/complete_guest.php
index 88bf1bd154..5de1f22e17 100644
--- a/mod/feedback/complete_guest.php
+++ b/mod/feedback/complete_guest.php
@@ -229,7 +229,7 @@
         print_heading(format_text($feedback->name));
         
         if( (intval($feedback->publish_stats) == 1) AND ( $capabilities->viewanalysepage) AND !( $capabilities->viewreports) ) {
-            echo '<div align="center"><a href="'.htmlspecialchars('analysis.php?id=' . $id . '&courseid='.$courseid).'">';
+            echo '<div class="mdl-align"><a href="'.htmlspecialchars('analysis.php?id=' . $id . '&courseid='.$courseid).'">';
             echo get_string('completed_feedbacks', 'feedback').'</a>';
             echo '</div>';
         }
@@ -279,7 +279,7 @@
             if(is_array($feedbackitems)){
                 // print_simple_box_start('center', '75%');
                 print_box_start('generalbox boxaligncenter boxwidthwide');
-                echo '<div align="center"><form name="frm" action="'.$ME.'" method="post" onsubmit=" ">';
+                echo '<div class="mdl-align"><form name="frm" action="'.$ME.'" method="post" onsubmit=" ">';
                 echo '<table>';
                 echo '<tr><td colspan="3" align="center">
                         <input type="hidden" name="anonymous" value="0" />
diff --git a/mod/feedback/delete_template.php b/mod/feedback/delete_template.php
index fc86ac627a..8a52966419 100644
--- a/mod/feedback/delete_template.php
+++ b/mod/feedback/delete_template.php
@@ -99,7 +99,7 @@
         print_box_end();
     }else {
         $templates = feedback_get_template_list($course, true);
-        echo '<div align="center">';
+        echo '<div class="mdl-align">';
         if(!is_array($templates)) {
             // print_simple_box(get_string('no_templates_available_yet', 'feedback'), "center");
             print_box(get_string('no_templates_available_yet', 'feedback'), 'generalbox boxaligncenter');
diff --git a/mod/feedback/import.php b/mod/feedback/import.php
index 42c301bd50..67966cef8a 100644
--- a/mod/feedback/import.php
+++ b/mod/feedback/import.php
@@ -132,7 +132,7 @@
 
      <?php
 
-    echo '<div align="center">';
+    echo '<div class="mdl-align">';
     print_single_button('edit.php', array('id'=>$id, 'do_show'=>'templates'), get_string('cancel'));
     echo '</div>';
     print_footer($course);
diff --git a/mod/feedback/print.php b/mod/feedback/print.php
index 3f88fb035e..046704443b 100644
--- a/mod/feedback/print.php
+++ b/mod/feedback/print.php
@@ -65,7 +65,7 @@
         
         // print_simple_box_start('center', '80%');
         print_box_start('generalbox boxaligncenter boxwidthwide');
-        echo '<div align="center" class="printview"><table>';
+        echo '<div class="mdl-align printview"><table>';
         //print the inserted items
         $itempos = 0;
         foreach($feedbackitems as $feedbackitem){
diff --git a/mod/feedback/show_entries.php b/mod/feedback/show_entries.php
index 9b07753be7..150e18315a 100644
--- a/mod/feedback/show_entries.php
+++ b/mod/feedback/show_entries.php
@@ -138,12 +138,12 @@
 
             $completedFeedbackCount = feedback_get_completeds_group_count($feedback, $mygroupid);
             if($feedback->course == SITEID){
-                echo '<div align="center"><a href="'.htmlspecialchars('analysis_course.php?id=' . $id . '&courseid='.$courseid).'">';
+                echo '<div class="mdl-align"><a href="'.htmlspecialchars('analysis_course.php?id=' . $id . '&courseid='.$courseid).'">';
                 echo get_string('course') .' '. get_string('analysis', 'feedback') . ' ('.get_string('completed_feedbacks', 'feedback').': '.intval($completedFeedbackCount).')</a>';
                 helpbutton('viewcompleted', '', 'feedback', true, true);
                 echo '</div>';
             }else {
-                echo '<div align="center"><a href="'.htmlspecialchars('analysis.php?id=' . $id . '&courseid='.$courseid).'">';
+                echo '<div class="mdl-align"><a href="'.htmlspecialchars('analysis.php?id=' . $id . '&courseid='.$courseid).'">';
                 echo get_string('analysis', 'feedback') . ' ('.get_string('completed_feedbacks', 'feedback').': '.intval($completedFeedbackCount).')</a>';
                 echo '</div>';
             }
@@ -167,7 +167,7 @@
                 $choose_group_form->set_data(array('id'=>$id, 'lstgroupid'=>$SESSION->feedback->lstgroupid, 'do_show'=>$do_show));
                 $choose_group_form->display();
             }
-            echo '<div align="center"><table><tr><td width="400">';
+            echo '<div class="mdl-align"><table><tr><td width="400">';
             if (!$students) {
                 if($courseid != SITEID){
                     notify(get_string('noexistingstudents'));
diff --git a/mod/feedback/show_entries_anonym.php b/mod/feedback/show_entries_anonym.php
index f35b5b26fe..3fc600a93b 100644
--- a/mod/feedback/show_entries_anonym.php
+++ b/mod/feedback/show_entries_anonym.php
@@ -93,7 +93,7 @@
         }
     </script>
 
-    <div align="center">
+    <div class="mdl-align">
     <form name="frm" action="<?php echo me();?>" method="post">
         <table>
             <tr>
diff --git a/mod/feedback/use_templ.php b/mod/feedback/use_templ.php
index 5cf14fee53..2bd21e7300 100644
--- a/mod/feedback/use_templ.php
+++ b/mod/feedback/use_templ.php
@@ -98,7 +98,7 @@
         echo '<p align="center">'.get_string('preview', 'feedback').'</p>';
         // print_simple_box_start('center', '75%');
         print_box_start('generalbox boxaligncenter boxwidthwide');
-        echo '<div align="center"><table>';
+        echo '<div class="mdl-align"><table>';
         foreach($templateitems as $templateitem){
             echo '<tr>';
             if($templateitem->hasvalue == 1 AND $feedback->autonumbering) {
diff --git a/mod/feedback/view.php b/mod/feedback/view.php
index 33b9e34dbc..af85ce0998 100644
--- a/mod/feedback/view.php
+++ b/mod/feedback/view.php
@@ -131,7 +131,7 @@
     
     if( (intval($feedback->publish_stats) == 1) AND ( $capabilities->viewanalysepage) AND !( $capabilities->viewreports) ) {
         if($multiple_count = $DB->count_records('feedback_tracking', array('userid'=>$USER->id, 'feedback'=>$feedback->id))) {
-            echo '<div align="center"><a href="'.htmlspecialchars('analysis.php?id=' . $id . '&courseid='.$courseid).'">';
+            echo '<div class="mdl-align"><a href="'.htmlspecialchars('analysis.php?id=' . $id . '&courseid='.$courseid).'">';
             echo get_string('completed_feedbacks', 'feedback').'</a>';
             echo '</div>';
         }
@@ -143,7 +143,7 @@
         if($feedback->course == SITEID) {
             // print_simple_box_start('center', '80%');
             print_box_start('generalbox boxaligncenter boxwidthwide');
-            echo '<div align="center">';
+            echo '<div class="mdl-align">';
             echo '<form action="mapcourse.php" method="get">';
             echo '<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />';
             echo '<input type="hidden" name="id" value="'.$id.'" />';
diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index d367114b46..0ab2070bd2 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -832,9 +832,9 @@ function forum_cron() {
                         }
                     }
                     if ($canunsubscribe) {
-                        $posthtml .= "\n<div align=\"right\"><font size=\"1\"><a href=\"$CFG->wwwroot/mod/forum/subscribe.php?id=$forum->id\">".get_string("unsubscribe", "forum")."</a></font></div>";
+                        $posthtml .= "\n<div class='mdl-right'><font size=\"1\"><a href=\"$CFG->wwwroot/mod/forum/subscribe.php?id=$forum->id\">".get_string("unsubscribe", "forum")."</a></font></div>";
                     } else {
-                        $posthtml .= "\n<div align=\"right\"><font size=\"1\">".get_string("everyoneissubscribed", "forum")."</font></div>";
+                        $posthtml .= "\n<div class='mdl-right'><font size=\"1\">".get_string("everyoneissubscribed", "forum")."</font></div>";
                     }
                     $posthtml .= '<hr size="1" noshade="noshade" /></p>';
                 }
diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php
index 5816aefa7d..53385c79e9 100644
--- a/mod/resource/type/file/resource.class.php
+++ b/mod/resource/type/file/resource.class.php
@@ -389,7 +389,7 @@ class resource_file extends resource_base {
             $options = new object();
             $options->para = false;
             if (!empty($localpath)) {  // Show some help
-                echo '<div align="right" class="helplink">';
+                echo '<div class="mdl-right helplink">';
                 link_to_popup_window ('/mod/resource/type/file/localpath.php', get_string('localfile', 'resource'), get_string('localfilehelp','resource'), 400, 500, get_string('localfilehelp', 'resource'));
                 echo '</div>';
             }
@@ -462,7 +462,7 @@ class resource_file extends resource_base {
             $options->para = false;
             echo '<div class="summary">'.format_text($resource->summary, FORMAT_HTML, $options).'</div>';
             if (!empty($localpath)) {  // Show some help
-                echo '<div align="right" class="helplink">';
+                echo '<div class="mdl-right helplink">';
                 link_to_popup_window ('/mod/resource/type/file/localpath.php', get_string('localfile', 'resource'),
                         get_string('localfilehelp','resource'), 400, 500, get_string('localfilehelp', 'resource'));
                 echo '</div>';
@@ -688,7 +688,7 @@ class resource_file extends resource_base {
 
         } else {              // Display the resource on it's own
             if (!empty($localpath)) {   // Show a link to help work around browser security
-                echo '<div align="right" class="helplink">';
+                echo '<div class="mdl-right helplink">';
                 link_to_popup_window ('/mod/resource/type/file/localpath.php', get_string('localfile', 'resource'),
                         get_string('localfilehelp','resource'), 400, 500, get_string('localfilehelp', 'resource'));
                 echo '</div>';
diff --git a/mod/resource/type/repository/resource.class.php b/mod/resource/type/repository/resource.class.php
index 04ef457540..8fb2e4f908 100644
--- a/mod/resource/type/repository/resource.class.php
+++ b/mod/resource/type/repository/resource.class.php
@@ -367,7 +367,7 @@ function display() {
 
         echo '<div class="summary">'.format_text($resource->summary, FORMAT_HTML, $formatoptions).'</div>';
         if (!empty($localpath)) {  // Show some help
-            echo '<div align="right" class="helplink">';
+            echo '<div class="mdl-right helplink">';
             link_to_popup_window ('/mod/resource/type/file/localpath.php', get_string('localfile', 'resource'), get_string('localfilehelp','resource'), 400, 500, get_string('localfilehelp', 'resource'));
             echo '</div>';
         }
@@ -481,7 +481,7 @@ function display() {
 
     } else {              // Display the resource on it's own
         if (!empty($localpath)) {   // Show a link to help work around browser security
-            echo '<div align="right" class="helplink">';
+            echo '<div class="mdl-right helplink">';
             link_to_popup_window ('/mod/resource/type/file/localpath.php', get_string('localfile', 'resource'), get_string('localfilehelp','resource'), 400, 500, get_string('localfilehelp', 'resource'));
             echo '</div>';
             echo "<center><p>(<a href=\"$fullurl\">$fullurl</a>)</p></center>";
diff --git a/mod/wiki/ewiki/ewiki.php b/mod/wiki/ewiki/ewiki.php
index fb377f1e97..2014ef3b1b 100644
--- a/mod/wiki/ewiki/ewiki.php
+++ b/mod/wiki/ewiki/ewiki.php
@@ -1653,7 +1653,7 @@ function ewiki_page_edit_preview(&$data) {
    $preview_text=$GLOBALS["ewiki_plugins"]["render"][0](optional_param("content", null), 1, EWIKI_ALLOW_HTML || (@$data["flags"]&EWIKI_DB_F_HTML));
    return( '<div class="preview">'
            . "<hr noshade>"
-           . "<div align=\"right\">" . ewiki_t("PREVIEW") . "</div><hr noshade><br />\n"
+           . "<div class='mdl-right'>" . ewiki_t("PREVIEW") . "</div><hr noshade><br />\n"
            . format_text($preview_text, $moodle_format)
            . "<br /><br /><hr noshade><br />"
            . "</div>"
@@ -1673,7 +1673,7 @@ function ewiki_control_links($id, &$data, $action) {
    }
 
    $o = "\n"
-      . '<div align="right" class="action-links control-links">'
+      . '<div class="mdl-right action-links control-links">'
       . "\n<br />\n"
       . "<hr noshade>" . "\n";
 
diff --git a/question/type/calculated/datasetdefinitions_form.php b/question/type/calculated/datasetdefinitions_form.php
index bd7b6bffce..806d2561d5 100644
--- a/question/type/calculated/datasetdefinitions_form.php
+++ b/question/type/calculated/datasetdefinitions_form.php
@@ -50,7 +50,7 @@ class question_dataset_dependent_definitions_form extends moodleform {
         $datadefscat= array();
         $datadefscat  = $this->qtypeobj->get_dataset_definitions_category($this->question);
         $datasetmenus = array();
-        $label = "<div align=\"center\">".get_string('datasetrole', 'qtype_datasetdependent','numerical')."</div>";
+        $label = "<div class='mdl-align'>".get_string('datasetrole', 'qtype_datasetdependent','numerical')."</div>";
         $mform->addElement('html', $label);// explaining the role of datasets so other strings can be shortened
         $mform->addElement('header', 'mandatoryhdr', get_string('mandatoryhdr', $stringfile));
         $labelsharedwildcard = get_string("sharedwildcard", "qtype_datasetdependent");
@@ -129,4 +129,4 @@ class question_dataset_dependent_definitions_form extends moodleform {
     }
 
 }
-?>
\ No newline at end of file
+?>
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index e6b591296e..731e6b7754 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -100,6 +100,12 @@ h6.main {
 .mdl-align {
   text-align: center;
 }
+.mdl-left {
+  text-align: left;
+}
+.mdl-right {
+  text-align: right;
+}
 
 .continuebutton {
   text-align: center;