Skip to content

Commit

Permalink
"MDL-17570, cleanup align property in div, merged from 1.9"
Browse files Browse the repository at this point in the history
  • Loading branch information
dongsheng committed Dec 10, 2008
1 parent aafdb44 commit 85db96c
Show file tree
Hide file tree
Showing 18 changed files with 26 additions and 25 deletions.
2 changes: 1 addition & 1 deletion admin/lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion admin/replace.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
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 />';
Expand Down
2 changes: 1 addition & 1 deletion course/format/topics/format.php
Original file line number Diff line number Diff line change
Expand Up @@ -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>';
Expand Down
2 changes: 1 addition & 1 deletion course/format/weeks/format.php
Original file line number Diff line number Diff line change
Expand Up @@ -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>';
Expand Down
2 changes: 1 addition & 1 deletion enrol/paypal/enrol.php
Original file line number Diff line number Diff line change
Expand Up @@ -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>';
Expand Down
2 changes: 1 addition & 1 deletion message/lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
2 changes: 1 addition & 1 deletion mod/data/lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ function display_edit_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>';
Expand Down
2 changes: 1 addition & 1 deletion mod/forum/lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -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>';
}
Expand Down
2 changes: 1 addition & 1 deletion mod/hotpot/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.'" />'
Expand Down
4 changes: 2 additions & 2 deletions mod/hotpot/view.php
Original file line number Diff line number Diff line change
Expand Up @@ -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="" /> ';
Expand Down
4 changes: 2 additions & 2 deletions mod/lesson/highscores.php
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion mod/resource/type/file/localfile.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function set_value(txt) {
</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 />
Expand Down
4 changes: 2 additions & 2 deletions mod/resource/type/file/localpath.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function set_value(txt) {
</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(); ?>">
Expand All @@ -54,4 +54,4 @@ function set_value(txt) {
</div>
<?php
print_footer('empty');
?>
?>
4 changes: 2 additions & 2 deletions mod/scorm/report.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 />";
Expand Down Expand Up @@ -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 />";
Expand Down
2 changes: 1 addition & 1 deletion mod/wiki/ewiki/plugins/moodle/downloads.php
Original file line number Diff line number Diff line change
Expand Up @@ -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 />';
}
}

Expand Down
7 changes: 3 additions & 4 deletions search/query.php
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,7 @@
?>
</form>
<br/>

<div align="center">
<div class="mdl-align">
<?php
print_string('searching', 'search') . ': ';

Expand Down Expand Up @@ -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');
Expand Down
4 changes: 2 additions & 2 deletions search/querylib.php
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ public function page_numbers() {
$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) {
Expand Down Expand Up @@ -487,4 +487,4 @@ public function get_results_per_page() {
return $this->results_per_page;
}
}
?>
?>
2 changes: 2 additions & 0 deletions theme/standard/styles_layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -2431,6 +2431,8 @@ body#course-info .generalbox.info {
text-align:center;
}

.jumpmenu {text-align:center}

/***
*** Group
***/
Expand Down

0 comments on commit 85db96c

Please sign in to comment.