diff options
author | Colin Fleming <cj_fleming@sky.com> | 2013-04-03 17:37:27 +0100 |
---|---|---|
committer | Colin Fleming <cj_fleming@sky.com> | 2013-04-03 17:37:27 +0100 |
commit | e8df541cdcdd95fe664c3d1287d76bc162a901c8 (patch) | |
tree | 4ff1cda138d8a872c6e8a2e9f6ac7f8e762bda2a /usr/local/www/system_firmware_check.php | |
parent | cd4a47d899d01a4037f0e0d0428a05a58e855409 (diff) | |
download | pfsense-e8df541cdcdd95fe664c3d1287d76bc162a901c8.zip pfsense-e8df541cdcdd95fe664c3d1287d76bc162a901c8.tar.gz |
Tidy up "system_firmware_check.php" XHTML
Remove closing HEAD tag
Move height and colspacing parameters into a style statement
Update background in TD tag to correct syntax
Add ALT parameter and close IMG tag
Add CDATA section to SCRIPT tags
Add missing closing P tag
Diffstat (limited to 'usr/local/www/system_firmware_check.php')
-rwxr-xr-x | usr/local/www/system_firmware_check.php | 55 |
1 files changed, 30 insertions, 25 deletions
diff --git a/usr/local/www/system_firmware_check.php b/usr/local/www/system_firmware_check.php index c69ce68..8272938 100755 --- a/usr/local/www/system_firmware_check.php +++ b/usr/local/www/system_firmware_check.php @@ -51,14 +51,12 @@ include("head.inc"); ?> -</head> - <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> <form action="system_firmware_auto.php" method="post"> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> +<table width="100%" border="0" cellpadding="0" cellspacing="0" summary="firmware check"> <tr> <td> <?php @@ -74,39 +72,33 @@ include("head.inc"); </tr> <tr> <td class="tabcont"> - <table width="100%" border="0" cellpadding="6" cellspacing="0"> + <table width="100%" border="0" cellpadding="6" cellspacing="0" summary=""> <tr> - <td> + <td align="center"> <!-- progress bar --> - <center> - <table height='15' width='420' border='0' colspacing='0' cellpadding='0' cellspacing='0'> + <table style="height:15;colspacing:0" width="420" border="0" cellpadding="0" cellspacing="0" summary="images"> <tr> - <td background="./themes/the_wall/images/misc/bar_left.gif" height='15' width='5'> - </td> + <td style="background:url('./themes/the_wall/images/misc/bar_left.gif')" height="15" width="5"></td> <td> - <table id="progholder" name="progholder" height='15' width='410' border='0' colspacing='0' cellpadding='0' cellspacing='0'> - <td background="./themes/the_wall/images/misc/bar_gray.gif" valign="top" align="left"> - <img src='./themes/the_wall/images/misc/bar_blue.gif' width='0' height='15' name='progressbar' id='progressbar'> - </td> + <table id="progholder" style="height:15;colspacing:0" width="410" border="0" cellpadding="0" cellspacing="0" summary=""> + <tr><td style="background:url('./themes/the_wall/images/misc/bar_gray.gif')" valign="top" align="left"> + <img src="./themes/the_wall/images/misc/bar_blue.gif" width="0" height="15" name="progressbar" id="progressbar" alt="" /> + </td></tr> </table> </td> - <td background="./themes/the_wall/images/misc/bar_right.gif" height='15' width='5'> - </td> + <td style="background:url('./themes/the_wall/images/misc/bar_right.gif')" height="15" width="5"></td> </tr> </table> - <br> + <br /> <!-- command output box --> - <textarea border='1' bordercolordark='#000000' bordercolorlight='#000000' cols='90' rows='9' name='output' id='output' wrap='hard'> - </textarea> - <div id='backupdiv' name='backupdiv' style='visibility:hidden'> + <textarea style="border:1;bordercolordark:#000000;bordercolorlight:#000000" cols="90" rows="9" name="output" id="output" wrap="hard"></textarea> + <div id="backupdiv" style="visibility:hidden"> <?php if ($g['hidebackupbeforeupgrade'] === false): ?> - <br/><input type="checkbox" name='backupbeforeupgrade' id='backupbeforeupgrade'> <?=gettext("Perform full backup prior to upgrade");?> + <br/><input type="checkbox" name="backupbeforeupgrade" id="backupbeforeupgrade" /><?=gettext("Perform full backup prior to upgrade");?> <?php endif; ?> </div> - </center> - <p> - <center><input id='invokeupgrade' style='visibility:hidden' type="submit" value="<?=gettext("Invoke Auto Upgrade"); ?>"></center> + <input id='invokeupgrade' style='visibility:hidden' type="submit" value="<?=gettext("Invoke Auto Upgrade"); ?>" /> </td> </tr> </table> @@ -164,12 +156,24 @@ if (!$remote_version) { update_output_window($static_text); if ($needs_system_upgrade == false) { + echo "</p>"; + echo "</form>"; require("fend.inc"); + echo "</body>"; + echo "</html>"; exit; } -echo "\n<script>jQuery('#invokeupgrade').css('visibility','visible');</script>"; -echo "\n<script>jQuery('#backupdiv').css('visibility','visible');</script>"; +echo "\n<script type=\"text/javascript\">\n"; +echo "//<![CDATA[\n"; +echo "jQuery('#invokeupgrade').css('visibility','visible');\n"; +echo "//]]>\n"; +echo "</script>\n"; +echo "\n<script type=\"text/javascript\">\n"; +echo "//<![CDATA[\n"; +echo "jQuery('#backupdiv').css('visibility','visible');\n"; +echo "//]]>\n"; +echo "</script>\n"; $txt = gettext("A new version is now available") . "\\n\\n"; $txt .= gettext("Current version") .": ". $current_installed_version . "\\n"; @@ -181,6 +185,7 @@ $txt .= " " . gettext("New version") .": ". $remote_version . "\\n\\n"; $txt .= " " . gettext("Update source") .": ". $updater_url . "\\n"; update_output_window($txt); ?> +</p> </form> <?php include("fend.inc"); ?> </body> |