diff options
author | Colin Fleming <cj_fleming@sky.com> | 2013-02-06 19:27:32 +0000 |
---|---|---|
committer | Colin Fleming <cj_fleming@sky.com> | 2013-02-06 19:27:32 +0000 |
commit | 52593da5dbff0bfa2dc86f1e8c28c9a5632ea4d6 (patch) | |
tree | 35dc6a187010dbbdc3d33c71dbf2946aa1aa2338 /usr/local/www/head.inc | |
parent | 0715ad5093226a9fd29b1abbbf57a9892efe4100 (diff) | |
download | pfsense-52593da5dbff0bfa2dc86f1e8c28c9a5632ea4d6.zip pfsense-52593da5dbff0bfa2dc86f1e8c28c9a5632ea4d6.tar.gz |
Update HTML in "include" files
Udated the DOCTYPE to make it W3C standard/compliant.
Moved "sorttable.js", "ticker.js" and the "antiClickJack style" from
"fbegin.inc" and place them in "head.inc" (where they belong), this may
also help the Widescreen package to work.
Close BR, INPUT and IMG tags properly, update IMG tags with "alt" and
update TABLE tags with "summary".
Updated the SCRIPT and STYLE with proper CDATA sections.
Updated LINK with the correct types.
Diffstat (limited to 'usr/local/www/head.inc')
-rwxr-xr-x | usr/local/www/head.inc | 40 |
1 files changed, 30 insertions, 10 deletions
diff --git a/usr/local/www/head.inc b/usr/local/www/head.inc index c8454a6..0bc1d00 100755 --- a/usr/local/www/head.inc +++ b/usr/local/www/head.inc @@ -9,37 +9,57 @@ $pagetitle = gentitle( $pgtitle ); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html> + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> <head> <title><?php echo($config['system']['hostname'] . "." . $config['system']['domain'] . " - " . $pagetitle); ?></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <link rel="apple-touch-icon" href="/themes/<?php echo $g['theme']; ?>/apple-touch-icon.png"/> <?php if (file_exists("{$g['www_path']}/themes/{$g['theme']}/table.css")): - echo "<link rel=\"stylesheet\" href=\"/themes/{$g['theme']}/table.css\" />"; + echo "<link type=\"text/css\" rel=\"stylesheet\" href=\"/themes/{$g['theme']}/table.css\" />"; else: - echo "<link rel=\"stylesheet\" href=\"/css/table.css\" media=\"all\" />"; + echo "<link type=\"text/css\" rel=\"stylesheet\" href=\"/css/table.css\" media=\"all\" />"; endif; ?> - + <?php if (strpos($_SERVER["SCRIPT_FILENAME"], "wizard.php") !== false && file_exists("{$g['www_path']}/themes/{$g['theme']}/wizard.css")): ?> - <?php echo "<style type=\"text/css\" src=\"/themes/{$g['theme']}/wizard.css\"></style>"; ?> + <?php echo "<link type=\"text/css\" rel=\"stylesheet\" href=\"/themes/{$g['theme']}/wizard.css\" />"; ?> <?php else: ?> - <link rel="stylesheet" href="/themes/<?php echo $g['theme']; ?>/all.css" media="all" /> + <link type="text/css" rel="stylesheet" href="/themes/<?php echo $g['theme']; ?>/all.css" media="all" /> <?php endif; ?> - <link rel="stylesheet" type="text/css" href="/niftycssCode.css"> - <link rel="stylesheet" type="text/css" href="/niftycssprintCode.css" media="print"> - <link rel="stylesheet" type="text/css" href="/themes/<?=$g['theme']?>/new_tab_menu.css" media="all"> + <link rel="stylesheet" type="text/css" href="/niftycssCode.css" /> + <link rel="stylesheet" type="text/css" href="/niftycssprintCode.css" media="print" /> + <link rel="stylesheet" type="text/css" href="/themes/<?=$g['theme']?>/new_tab_menu.css" media="all" /> <script type="text/javascript" src="/javascript/niftyjsCode.js"></script> <script type="text/javascript" src="/javascript/jquery.js"></script> <script type="text/javascript" src="/javascript/jquery/jquery-ui.custom.min.js"></script> <script type="text/javascript"> + //<![CDATA[ var theme = "<?php echo $g['theme']; ?>"; jQuery.noConflict(); + //]]> </script> + + <script type="text/javascript" src="/javascript/sorttable.js"></script> + <script type="text/javascript" src="/javascript/ticker.js"></script> + <style type="text/css" id="antiClickjack"> + /*<![CDATA[*/ + body{display:none} + /*]]>*/ + </style> + <script type="text/javascript"> + //<![CDATA[ + if (self === top) { + var antiClickjack = document.getElementById("antiClickjack"); antiClickjack.parentNode.removeChild(antiClickjack); + } else { + top.location = self.location; + } + //]]> + </script> + <?php echo "\t<script type=\"text/javascript\" src=\"/themes/{$g['theme']}/loader.js\"></script>\n"; ?> <?php if($_GET['enablefirebuglite']) { |