Index: install_20.php
===================================================================
RCS file: /cvsroot/moodle/contrib/tools/m4w_builder/installer/install_20.php,v
retrieving revision 1.2
diff -u -r1.2 install_20.php
--- install_20.php	4 May 2008 01:25:37 -0000	1.2
+++ install_20.php	12 May 2008 06:24:20 -0000
@@ -136,6 +136,7 @@
 $CFG->directorypermissions = 00777;
 $CFG->running_installer = true;
 $CFG->docroot = 'http://docs.moodle.org';
+$CFG->httpswwwroot = $INSTALL['wwwrootform']; // Needed by doc_link() in Server Checks page.
 $COURSE->id = 0;
 
 /// Include some moodle libraries
@@ -493,6 +494,7 @@
 //==========================================================================//
 
 ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 
 
@@ -516,10 +518,10 @@
 ?>
 
 
-<table class="main" align="center" cellpadding="3" cellspacing="0">
+<table class="main" cellpadding="3" cellspacing="0">
     <tr>
         <td class="td_mainlogo">
-            <p class="p_mainlogo"><img src="pix/moodlelogo-med-white.gif" width="240" height="60" alt="Moodle logo"></p>
+            <p class="p_mainlogo"><img src="pix/moodlelogo-med-white.gif" width="240" height="60" alt="Moodle logo"/></p>
         </td>
         <td class="td_mainlogo" valign="bottom">
             <p class="p_mainheader"><?php print_string('installation', 'install') ?></p>
@@ -540,7 +542,7 @@
 
 <?php
 
-if (!empty($errormsg)) echo "<p class=\"errormsg\" align=\"center\">$errormsg</p>\n";
+if (!empty($errormsg)) echo "<p class=\"errormsg\" style=\"text-align:center\">$errormsg</p>\n";
 
 
 if ($nextstage == SAVE) {
@@ -548,13 +550,13 @@
     $options = array();
     $options['lang'] = $INSTALL['language'];
     if ($configsuccess) {
-        echo "<p>".get_string('configfilewritten', 'install')."</p>\n";
+        echo "<p class=\"p_install\">".get_string('configfilewritten', 'install')."</p>\n";
 
         echo "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n";
         echo "<tr>\n";
-        echo "<td width=\"33.3%\">&nbsp;</td>\n";
-        echo "<td width=\"33.3%\">&nbsp;</td>\n";
-        echo "<td width=\"33.3%\" align=\"right\">\n";
+        echo "<td>&nbsp;</td>\n";
+        echo "<td>&nbsp;</td>\n";
+        echo "<td align=\"right\">\n";
         print_single_button("index.php", $options, get_string('continue'));
         echo "</td>\n";
         echo "</tr>\n";
@@ -565,13 +567,13 @@
 
         echo "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n";
         echo "<tr>\n";
-        echo "<td width=\"33.3%\">&nbsp;</td>\n";
-        echo "<td width=\"33.3%\" align=\"center\">\n";
+        echo "<td>&nbsp;</td>\n";
+        echo "<td align=\"center\">\n";
         $installoptions = array();
         $installoptions['download'] = 1;
         print_single_button("install.php", $installoptions, get_string('download', 'install'));
         echo "</td>\n";
-        echo "<td width=\"33.3%\" align=\"right\">\n";
+        echo "<td align=\"right\">\n";
         print_single_button("index.php", $options, get_string('continue'));
         echo "</td>\n";
         echo "</tr>\n";
@@ -623,14 +625,14 @@
     if ($nextstage != DOWNLOADLANG) {
         $needtoopenform = false;
 ?>
-        <form name="installform" method="post" action="<?php echo $formaction ?>">
-        <input type="hidden" name="stage" value="<?php echo $nextstage ?>" />
+        <form id="installform" method="post" action="<?php echo $formaction ?>">
+        <div><input type="hidden" name="stage" value="<?php echo $nextstage ?>" /></div>
 <?php
     } else {
         $needtoopenform = true;
     }
 ?>
-    <table class="install_table" cellspacing="3" cellpadding="3" align="center">
+    <table class="install_table" cellspacing="3" cellpadding="3">
 
 <?php
     /// what we do depends on the stage we're at
@@ -638,7 +640,7 @@
         case WELCOME: /// Language settings
 ?>
             <tr>
-                <td class="td_left"><p><?php print_string('language') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('language') ?></p></td>
                 <td class="td_right">
                 <?php choose_from_menu (get_installer_list_of_languages(), 'language', $INSTALL['language'], '', 'this.form.submit();') ?>
                 </td>
@@ -680,19 +682,19 @@
 ?>
 
             <tr>
-                <td class="td_left"><p><?php print_string('wwwroot', 'install') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('wwwroot', 'install') ?></p></td>
                 <td class="td_right">
                     <input type="text" size="40" name="wwwrootform" value="<?php p($INSTALL['wwwrootform'],true) ?>" />
                 </td>
             </tr>
             <tr>
-                <td class="td_left"><p><?php print_string('dirroot', 'install') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('dirroot', 'install') ?></p></td>
                 <td class="td_right">
                     <input type="text" size="40" name="dirrootform" disabled="disabled" value="<?php p($INSTALL['dirrootform'],true) ?>" />
                 </td>
             </tr>
             <tr>
-                <td class="td_left"><p><?php print_string('dataroot', 'install') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('dataroot', 'install') ?></p></td>
                 <td class="td_right">
                     <input type="text" size="40" name="dataroot" value="<?php p($INSTALL['dataroot'],true) ?>" />
                 </td>
@@ -704,31 +706,31 @@
 ?>
 
             <tr>
-                <td class="td_left"><p><?php print_string('dbtype', 'install') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('dbtype', 'install') ?></p></td>
                 <td><input type="hidden" size="40" name="dbtype" value="mysql" />mysql</td>
             </tr>
             <tr>
-                <td class="td_left"><p><?php print_string('dbhost', 'install') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('dbhost', 'install') ?></p></td>
                 <td><input type="hidden" size="40" name="dbhost" value="localhost" />localhost</td>
             </tr>
             <tr>
-                <td class="td_left"><p><?php print_string('database', 'install') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('database', 'install') ?></p></td>
                 <td class="td_right">
                     <input type="text" size="40" name="dbname" value="<?php p($INSTALL['dbname']) ?>" />
                 </td>
             </tr>
             <tr>
-                <td class="td_left"><p><?php print_string('user') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('user') ?></p></td>
                 <td><input type="hidden" size="40" name="dbuser" value="root" />root</td>
             </tr>
             <tr>
-                <td class="td_left"><p><?php print_string('password') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('password') ?></p></td>
                 <td class="td_right">
                     <input type="password" size="40" name="dbpass" value="<?php p($INSTALL['dbpass']) ?>" />
                 </td>
             </tr>
             <tr>
-                <td class="td_left"><p><?php print_string('dbprefix', 'install') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('dbprefix', 'install') ?></p></td>
                 <td class="td_right">
                     <input type="text" size="40" name="prefix" value="<?php p($INSTALL['prefix']) ?>" />
                 </td>
@@ -740,7 +742,7 @@
 ?>
 
             <tr>
-                <td class="td_left"><p><?php print_string('admindirname', 'install') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('admindirname', 'install') ?></p></td>
                 <td class="td_right">
                     <input type="text" size="40" name="admindirname" value="<?php p($INSTALL['admindirname']) ?>" />
                 </td>
@@ -765,7 +767,7 @@
                     /// We never should reach this because DB has been tested before arriving here
                         $errormsg = get_string('dbconnectionerror', 'install');
                         $nextstage = DATABASE;
-                        echo '<p class="errormsg" align="center">'.get_string('dbconnectionerror', 'install').'</p>';
+                        echo '<p class="errormsg" style="text-align:center">'.get_string('dbconnectionerror', 'install').'</p>';
                     }
                 ?>
                 </td>
@@ -788,7 +790,7 @@
                          $options['stage'] = DOWNLOADLANG;
                          $options['same'] = true;
                          print_simple_box_start('center');
-                         print_single_button('install.php', $options, get_string('downloadlanguagebutton','install', $languages[$INSTALL['language']]), 'POST');
+                         print_single_button('install.php', $options, get_string('downloadlanguagebutton','install', $languages[$INSTALL['language']]), 'post');
                          print_simple_box_end();
                      } else {
                  /// Show result info 
@@ -820,13 +822,13 @@
 <?php
     if ($needtoopenform) {
 ?>
-            <form name="installform" method="post" action="<?php echo $formaction ?>">
-             <input type="hidden" name="stage" value="<?php echo $nextstage ?>" />
+            <form id="installform" method="post" action="<?php echo $formaction ?>">
+            <div><input type="hidden" name="stage" value="<?php echo $nextstage ?>" /></div>
 <?php
     }
 ?>
-            <?php echo ($nextstage < SAVE) ? "<input type=\"submit\" name=\"next\" value=\"".get_string('next')."  &raquo;\" style=\"float: ".fix_align_rtl("right")."\"/>\n" : "&nbsp;\n" ?>
-            <?php echo ($nextstage > WELCOME) ? "<input type=\"submit\" name=\"prev\" value=\"&laquo;  ".get_string('previous')."\" style=\"float: ".fix_align_rtl("left")."\"/>\n" : "&nbsp;\n" ?>
+            <?php echo ($nextstage < SAVE) ? "<div><input type=\"submit\" name=\"next\" value=\"".get_string('next')."  &raquo;\" style=\"float: ".fix_align_rtl("right")."\"/></div>\n" : "&nbsp;\n" ?>
+            <?php echo ($nextstage > WELCOME) ? "<div><input type=\"submit\" name=\"prev\" value=\"&laquo;  ".get_string('previous')."\" style=\"float: ".fix_align_rtl("left")."\"/></div>\n" : "&nbsp;\n" ?>
 
 <?php
     if ($needtoopenform) {
@@ -858,16 +860,16 @@
 
 function print_compatibility_row($success, $testtext, $errormessage, $helpfield='', $caution=false) {
     echo "<tr>\n";
-    echo "<td class=\"td_left\" valign=\"top\" nowrap width=\"160\"><p>$testtext</p></td>\n";
+    echo "<td class=\"td_left_nowrap\" valign=\"top\"><p class=\"p_install\">$testtext</p></td>\n";
     if ($success) {
         echo "<td valign=\"top\"><p class=\"p_pass\">".get_string('pass', 'install')."</p></td>\n";
         echo "<td valign=\"top\">&nbsp;</td>\n";
     } else {
-        echo "<td valign=\"top\"";
+        echo "<td valign=\"top\">";
         echo ($caution) ? "<p class=\"p_caution\">".get_string('caution', 'install') : "<p class=\"p_fail\">".get_string('fail', 'install');
         echo "</p></td>\n";
         echo "<td valign=\"top\">";
-        echo "<p>$errormessage ";
+        echo "<p class=\"p_install\">$errormessage ";
         install_helpbutton("install.php?help=$helpfield");
         echo "</p></td>\n";
     }
@@ -882,10 +884,12 @@
     if ($title == '') {
         $title = get_string('help');
     }
-    echo "<a href=\"javascript: void(0)\">";
-    echo "<img src=\"./pix/help.gif\" height=\"17\" width=\"17\" alt=\"$title\"";
-    echo "border=\"0\" align=\"middle\" title=\"$title\" ";
-    echo "onClick=\"return window.open('$url', 'Help', 'menubar=0,location=0,scrollbars,resizable,width=500,height=400')\">";
+    echo "<a href=\"javascript:void(0)\" ";
+
+
+    echo "onclick=\"return window.open('$url','Help','menubar=0,location=0,scrollbars,resizable,width=500,height=400')\"";
+    echo ">";
+    echo "<img src=\"pix/help.gif\" class=\"iconhelp\" alt=\"$title\" title=\"$title\"/>";
     echo "</a>\n";
 }
 
@@ -1001,11 +1005,20 @@
     }
     .install_table {
         width: 500px;
+        margin-left:auto;
+        margin-right:auto;
     }
     .td_left {
         text-align: <?php echo fix_align_rtl("right") ?>;
         font-weight: bold;
     }
+    .td_left_nowrap{
+        text-align: <?php echo fix_align_rtl("right") ?>;
+        font-weight: bold;
+        white-space: nowrap;
+        width: 160px;
+        padding-left: 10px;
+    }
     .td_right {
         text-align: <?php echo fix_align_rtl("left") ?>;
     }
@@ -1014,43 +1027,60 @@
         border-width: 1px;
         border-style: solid;
         border-color: #dddddd;
+        margin-left:auto;
+        margin-right:auto;
         -moz-border-radius-bottomleft: 15px;
         -moz-border-radius-bottomright: 15px;
     }
     .td_mainheading {
         background-color: #eeeeee;
-        padding: 10px;
+        padding-left: 10px;
     }
     .td_main {
         text-align: center;
     }
     .td_mainlogo {
+        vertical-align: middle;
     }
     .p_mainlogo {
+        margin-top: 0px;
+        margin-bottom: 0px;
     }
     .p_mainheading {
         font-size: 11pt;
+        margin-top: 16px;
+        margin-bottom: 16px;
     }
     .p_subheading {
         font-size: 10pt;
-        padding: 10px;
+        padding-left: 10px;
+        margin-top: 16px;
+        margin-bottom: 16px;
     }
     .p_mainheader{
         text-align: right;
         font-size: 20pt;
         font-weight: bold;
+        margin-top: 0px;
+        margin-bottom: 0px;
     }
     .p_pass {
         color: green;
         font-weight: bold;
+        margin-top: 0px;
+        margin-bottom: 0px;
     }
     .p_fail {
         color: red;
         font-weight: bold;
+        margin-top: 0px;
+        margin-bottom: 0px;
     }
     .p_caution {
         color: #660000;
         font-weight: bold;
+        margin-top: 0px;
+        margin-bottom: 0px;
     }
     .p_help {
         text-align: center;
@@ -1058,6 +1088,15 @@
         font-size: 14pt;
         font-weight: bold;
         color: #333333;
+        margin-top: 0px;
+        margin-bottom: 0px;
+    }
+    /* This override the p tag for every p tag in this installation script,
+       but not in lang\xxx\installer.php 
+      */
+    .p_install {
+        margin-top: 0px;
+        margin-bottom: 0px; 
     }
     .environmenttable {
         font-size: 10pt;
@@ -1077,7 +1116,7 @@
     .errorboxcontent {
         text-align: center;
         font-weight: bold;
-        padding: 20px;
+        padding-left: 20px;
         color: #ff0000;
     }
     .invisiblefieldset {
Index: install_19.php
===================================================================
RCS file: /cvsroot/moodle/contrib/tools/m4w_builder/installer/install_19.php,v
retrieving revision 1.7
diff -u -r1.7 install_19.php
--- install_19.php	3 Mar 2008 23:20:49 -0000	1.7
+++ install_19.php	12 May 2008 06:23:41 -0000
@@ -136,6 +136,7 @@
 $CFG->directorypermissions = 00777;
 $CFG->running_installer = true;
 $CFG->docroot = 'http://docs.moodle.org';
+$CFG->httpswwwroot = $INSTALL['wwwrootform']; // Needed by doc_link() in Server Checks page.
 $COURSE->id = 0;
 
 /// Include some moodle libraries
@@ -493,6 +494,7 @@
 //==========================================================================//
 
 ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
 
 
@@ -516,10 +518,10 @@
 ?>
 
 
-<table class="main" align="center" cellpadding="3" cellspacing="0">
+<table class="main" cellpadding="3" cellspacing="0">
     <tr>
         <td class="td_mainlogo">
-            <p class="p_mainlogo"><img src="pix/moodlelogo-med-white.gif" width="240" height="60" alt="Moodle logo"></p>
+            <p class="p_mainlogo"><img src="pix/moodlelogo-med-white.gif" width="240" height="60" alt="Moodle logo"/></p>
         </td>
         <td class="td_mainlogo" valign="bottom">
             <p class="p_mainheader"><?php print_string('installation', 'install') ?></p>
@@ -540,7 +542,7 @@
 
 <?php
 
-if (!empty($errormsg)) echo "<p class=\"errormsg\" align=\"center\">$errormsg</p>\n";
+if (!empty($errormsg)) echo "<p class=\"errormsg\" style=\"text-align:center\">$errormsg</p>\n";
 
 
 if ($nextstage == SAVE) {
@@ -548,13 +550,13 @@
     $options = array();
     $options['lang'] = $INSTALL['language'];
     if ($configsuccess) {
-        echo "<p>".get_string('configfilewritten', 'install')."</p>\n";
+        echo "<p class=\"p_install\">".get_string('configfilewritten', 'install')."</p>\n";
 
         echo "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n";
         echo "<tr>\n";
-        echo "<td width=\"33.3%\">&nbsp;</td>\n";
-        echo "<td width=\"33.3%\">&nbsp;</td>\n";
-        echo "<td width=\"33.3%\" align=\"right\">\n";
+        echo "<td>&nbsp;</td>\n";
+        echo "<td>&nbsp;</td>\n";
+        echo "<td align=\"right\">\n";
         print_single_button("index.php", $options, get_string('continue'));
         echo "</td>\n";
         echo "</tr>\n";
@@ -565,13 +567,13 @@
 
         echo "<table cellspacing=\"0\" cellpadding=\"0\" border=\"0\" width=\"100%\">\n";
         echo "<tr>\n";
-        echo "<td width=\"33.3%\">&nbsp;</td>\n";
-        echo "<td width=\"33.3%\" align=\"center\">\n";
+        echo "<td>&nbsp;</td>\n";
+        echo "<td align=\"center\">\n";
         $installoptions = array();
         $installoptions['download'] = 1;
         print_single_button("install.php", $installoptions, get_string('download', 'install'));
         echo "</td>\n";
-        echo "<td width=\"33.3%\" align=\"right\">\n";
+        echo "<td align=\"right\">\n";
         print_single_button("index.php", $options, get_string('continue'));
         echo "</td>\n";
         echo "</tr>\n";
@@ -623,14 +625,14 @@
     if ($nextstage != DOWNLOADLANG) {
         $needtoopenform = false;
 ?>
-        <form name="installform" method="post" action="<?php echo $formaction ?>">
-        <input type="hidden" name="stage" value="<?php echo $nextstage ?>" />
+        <form id="installform" method="post" action="<?php echo $formaction ?>">
+        <div><input type="hidden" name="stage" value="<?php echo $nextstage ?>" /></div>
 <?php
     } else {
         $needtoopenform = true;
     }
 ?>
-    <table class="install_table" cellspacing="3" cellpadding="3" align="center">
+    <table class="install_table" cellspacing="3" cellpadding="3">
 
 <?php
     /// what we do depends on the stage we're at
@@ -638,7 +640,7 @@
         case WELCOME: /// Language settings
 ?>
             <tr>
-                <td class="td_left"><p><?php print_string('language') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('language') ?></p></td>
                 <td class="td_right">
                 <?php choose_from_menu (get_installer_list_of_languages(), 'language', $INSTALL['language'], '', 'this.form.submit();') ?>
                 </td>
@@ -680,19 +682,19 @@
 ?>
 
             <tr>
-                <td class="td_left"><p><?php print_string('wwwroot', 'install') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('wwwroot', 'install') ?></p></td>
                 <td class="td_right">
                     <input type="text" size="40" name="wwwrootform" value="<?php p($INSTALL['wwwrootform'],true) ?>" />
                 </td>
             </tr>
             <tr>
-                <td class="td_left"><p><?php print_string('dirroot', 'install') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('dirroot', 'install') ?></p></td>
                 <td class="td_right">
                     <input type="text" size="40" name="dirrootform" disabled="disabled" value="<?php p($INSTALL['dirrootform'],true) ?>" />
                 </td>
             </tr>
             <tr>
-                <td class="td_left"><p><?php print_string('dataroot', 'install') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('dataroot', 'install') ?></p></td>
                 <td class="td_right">
                     <input type="text" size="40" name="dataroot" value="<?php p($INSTALL['dataroot'],true) ?>" />
                 </td>
@@ -704,31 +706,31 @@
 ?>
 
             <tr>
-                <td class="td_left"><p><?php print_string('dbtype', 'install') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('dbtype', 'install') ?></p></td>
                 <td><input type="hidden" size="40" name="dbtype" value="mysql" />mysql</td>
             </tr>
             <tr>
-                <td class="td_left"><p><?php print_string('dbhost', 'install') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('dbhost', 'install') ?></p></td>
                 <td><input type="hidden" size="40" name="dbhost" value="localhost" />localhost</td>
             </tr>
             <tr>
-                <td class="td_left"><p><?php print_string('database', 'install') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('database', 'install') ?></p></td>
                 <td class="td_right">
                     <input type="text" size="40" name="dbname" value="<?php p($INSTALL['dbname']) ?>" />
                 </td>
             </tr>
             <tr>
-                <td class="td_left"><p><?php print_string('user') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('user') ?></p></td>
                 <td><input type="hidden" size="40" name="dbuser" value="root" />root</td>
             </tr>
             <tr>
-                <td class="td_left"><p><?php print_string('password') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('password') ?></p></td>
                 <td class="td_right">
                     <input type="password" size="40" name="dbpass" value="<?php p($INSTALL['dbpass']) ?>" />
                 </td>
             </tr>
             <tr>
-                <td class="td_left"><p><?php print_string('dbprefix', 'install') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('dbprefix', 'install') ?></p></td>
                 <td class="td_right">
                     <input type="text" size="40" name="prefix" value="<?php p($INSTALL['prefix']) ?>" />
                 </td>
@@ -740,7 +742,7 @@
 ?>
 
             <tr>
-                <td class="td_left"><p><?php print_string('admindirname', 'install') ?></p></td>
+                <td class="td_left"><p class="p_install"><?php print_string('admindirname', 'install') ?></p></td>
                 <td class="td_right">
                     <input type="text" size="40" name="admindirname" value="<?php p($INSTALL['admindirname']) ?>" />
                 </td>
@@ -765,7 +767,7 @@
                     /// We never should reach this because DB has been tested before arriving here
                         $errormsg = get_string('dbconnectionerror', 'install');
                         $nextstage = DATABASE;
-                        echo '<p class="errormsg" align="center">'.get_string('dbconnectionerror', 'install').'</p>';
+                        echo '<p class="errormsg" style="text-align:center">'.get_string('dbconnectionerror', 'install').'</p>';
                     }
                 ?>
                 </td>
@@ -788,7 +790,7 @@
                          $options['stage'] = DOWNLOADLANG;
                          $options['same'] = true;
                          print_simple_box_start('center');
-                         print_single_button('install.php', $options, get_string('downloadlanguagebutton','install', $languages[$INSTALL['language']]), 'POST');
+                         print_single_button('install.php', $options, get_string('downloadlanguagebutton','install', $languages[$INSTALL['language']]), 'post');
                          print_simple_box_end();
                      } else {
                  /// Show result info 
@@ -820,13 +822,13 @@
 <?php
     if ($needtoopenform) {
 ?>
-            <form name="installform" method="post" action="<?php echo $formaction ?>">
-             <input type="hidden" name="stage" value="<?php echo $nextstage ?>" />
+            <form id="installform" method="post" action="<?php echo $formaction ?>">
+            <div><input type="hidden" name="stage" value="<?php echo $nextstage ?>" /></div>
 <?php
     }
 ?>
-            <?php echo ($nextstage < SAVE) ? "<input type=\"submit\" name=\"next\" value=\"".get_string('next')."  &raquo;\" style=\"float: ".fix_align_rtl("right")."\"/>\n" : "&nbsp;\n" ?>
-            <?php echo ($nextstage > WELCOME) ? "<input type=\"submit\" name=\"prev\" value=\"&laquo;  ".get_string('previous')."\" style=\"float: ".fix_align_rtl("left")."\"/>\n" : "&nbsp;\n" ?>
+            <?php echo ($nextstage < SAVE) ? "<div><input type=\"submit\" name=\"next\" value=\"".get_string('next')."  &raquo;\" style=\"float: ".fix_align_rtl("right")."\"/></div>\n" : "&nbsp;\n" ?>
+            <?php echo ($nextstage > WELCOME) ? "<div><input type=\"submit\" name=\"prev\" value=\"&laquo;  ".get_string('previous')."\" style=\"float: ".fix_align_rtl("left")."\"/></div>\n" : "&nbsp;\n" ?>
 
 <?php
     if ($needtoopenform) {
@@ -858,16 +860,16 @@
 
 function print_compatibility_row($success, $testtext, $errormessage, $helpfield='', $caution=false) {
     echo "<tr>\n";
-    echo "<td class=\"td_left\" valign=\"top\" nowrap width=\"160\"><p>$testtext</p></td>\n";
+    echo "<td class=\"td_left_nowrap\" valign=\"top\"><p class=\"p_install\">$testtext</p></td>\n";
     if ($success) {
         echo "<td valign=\"top\"><p class=\"p_pass\">".get_string('pass', 'install')."</p></td>\n";
         echo "<td valign=\"top\">&nbsp;</td>\n";
     } else {
-        echo "<td valign=\"top\"";
+        echo "<td valign=\"top\">";
         echo ($caution) ? "<p class=\"p_caution\">".get_string('caution', 'install') : "<p class=\"p_fail\">".get_string('fail', 'install');
         echo "</p></td>\n";
         echo "<td valign=\"top\">";
-        echo "<p>$errormessage ";
+        echo "<p class=\"p_install\">$errormessage ";
         install_helpbutton("install.php?help=$helpfield");
         echo "</p></td>\n";
     }
@@ -882,10 +884,12 @@
     if ($title == '') {
         $title = get_string('help');
     }
-    echo "<a href=\"javascript: void(0)\">";
-    echo "<img src=\"./pix/help.gif\" height=\"17\" width=\"17\" alt=\"$title\"";
-    echo "border=\"0\" align=\"middle\" title=\"$title\" ";
-    echo "onClick=\"return window.open('$url', 'Help', 'menubar=0,location=0,scrollbars,resizable,width=500,height=400')\">";
+    echo "<a href=\"javascript:void(0)\" ";
+
+
+    echo "onclick=\"return window.open('$url','Help','menubar=0,location=0,scrollbars,resizable,width=500,height=400')\"";
+    echo ">";
+    echo "<img src=\"pix/help.gif\" class=\"iconhelp\" alt=\"$title\" title=\"$title\"/>";
     echo "</a>\n";
 }
 
@@ -1006,11 +1010,20 @@
     }
     .install_table {
         width: 500px;
+        margin-left:auto;
+        margin-right:auto;
     }
     .td_left {
         text-align: <?php echo fix_align_rtl("right") ?>;
         font-weight: bold;
     }
+    .td_left_nowrap{
+        text-align: <?php echo fix_align_rtl("right") ?>;
+        font-weight: bold;
+        white-space: nowrap;
+        width: 160px;
+        padding-left: 10px;
+    }
     .td_right {
         text-align: <?php echo fix_align_rtl("left") ?>;
     }
@@ -1019,43 +1032,60 @@
         border-width: 1px;
         border-style: solid;
         border-color: #dddddd;
+        margin-left:auto;
+        margin-right:auto;
         -moz-border-radius-bottomleft: 15px;
         -moz-border-radius-bottomright: 15px;
     }
     .td_mainheading {
         background-color: #eeeeee;
-        padding: 10px;
+        padding-left: 10px;
     }
     .td_main {
         text-align: center;
     }
     .td_mainlogo {
+        vertical-align: middle;
     }
     .p_mainlogo {
+        margin-top: 0px;
+        margin-bottom: 0px;
     }
     .p_mainheading {
         font-size: 11pt;
+        margin-top: 16px;
+        margin-bottom: 16px;
     }
     .p_subheading {
         font-size: 10pt;
-        padding: 10px;
+        padding-left: 10px;
+        margin-top: 16px;
+        margin-bottom: 16px;
     }
     .p_mainheader{
         text-align: right;
         font-size: 20pt;
         font-weight: bold;
+        margin-top: 0px;
+        margin-bottom: 0px;
     }
     .p_pass {
         color: green;
         font-weight: bold;
+        margin-top: 0px;
+        margin-bottom: 0px;
     }
     .p_fail {
         color: red;
         font-weight: bold;
+        margin-top: 0px;
+        margin-bottom: 0px;
     }
     .p_caution {
         color: #660000;
         font-weight: bold;
+        margin-top: 0px;
+        margin-bottom: 0px;
     }
     .p_help {
         text-align: center;
@@ -1063,6 +1093,15 @@
         font-size: 14pt;
         font-weight: bold;
         color: #333333;
+        margin-top: 0px;
+        margin-bottom: 0px;
+    }
+    /* This override the p tag for every p tag in this installation script,
+       but not in lang\xxx\installer.php 
+      */
+    .p_install {
+        margin-top: 0px;
+        margin-bottom: 0px; 
     }
     .environmenttable {
         font-size: 10pt;
@@ -1082,7 +1121,7 @@
     .errorboxcontent {
         text-align: center;
         font-weight: bold;
-        padding: 20px;
+        padding-left: 20px;
         color: #ff0000;
     }
     .invisiblefieldset {
