Skip to content

Commit

Permalink
Issue-4930: Fixed the invalid html doctype and missing xmlns that wer…
Browse files Browse the repository at this point in the history 
…e used in handbook and popup frame window.
  • Loading branch information
@cindyli
cindyli committed Nov 24, 2011
1 parent 02a36cd commit 2877532
Show file tree
Hide file tree
Showing 6 changed files with 239 additions and 228 deletions.
196 changes: 98 additions & 98 deletions documentation/frame_header.php
View file
@@ -1,99 +1,99 @@
<?php
/************************************************************************/
/* AChecker */
/************************************************************************/
/* Copyright (c) 2008 - 2011 */
/* Inclusive Design Institute */
/* */
/* This program is free software. You can redistribute it and/or */
/* modify it under the terms of the GNU General Public License */
/* as published by the Free Software Foundation. */
/************************************************************************/
// $Id$

define('AC_INCLUDE_PATH', '../include/');
include(AC_INCLUDE_PATH.'vitals.inc.php');

if (isset($_GET['p'])) {
$this_page = htmlentities($_GET['p']);
} else {
exit;
}

?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict //EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html lang="<?php echo DEFAULT_LANGUAGE_CODE; ?>">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php echo _AC('achecker_documentation'); ?></title>
<style type="text/css">
body { font-family: Verdana,Arial,sans-serif; font-size: x-small; margin: 0px; padding: 3px; background: #f4f4f4; color: #afafaf; }
ul, ol { list-style: none; padding-left: 0px; margin-left: -15px; }
li { margin-left: 19pt; padding-top: 2px; }
a { text-decoration: none; }
a:link, a:visited { color: #006699; }
a:hover { color: #66AECC; }
input { border: 0px; padding: 2px 5px 2px 5px; }
input[type=submit] { background-color: #dfdfdf; padding: 1px; border: #AAA solid 1px; }
input[type=submit]:hover { color: blue; background-color: #eee; padding: 1px; }
form { padding: 0px; margin: 0px; display: inline; }
</style>
<script type="text/javascript">
// <!--
var currentPage;

function showTocToggle(show, hide) {
if(document.getElementById) {
document.writeln('<a href="javascript:toggleToc(false)">' +
'<span id="showlink" style="display:none;">' + show + '</span>' +
'<span id="hidelink">' + hide + '</span>' + '</a>');
}
}
function toggleToc(override) {
var showlink=document.getElementById('showlink');
var hidelink=document.getElementById('hidelink');

if (override && (hidelink.style.display == 'none')) {
top.show();
hidelink.style.display='';
showlink.style.display='none';
} else if (!override && (hidelink.style.display == 'none')) {
top.show();
hidelink.style.display='';
showlink.style.display='none';
} else if (!override) {
top.hide(); //('0, *');
hidelink.style.display='none';
showlink.style.display='';
}
}
// -->
</script>
</head>
<body><form method="get" action="search.php" target="toc" onsubmit='toggleToc(true);false;'>
<input type="hidden" name="p" value="<?php echo $this_page; ?>">

<script type="text/javascript">
// <!--
if (top.name == 'popup') {
document.write('<a href="javascript:top.close();"><?php echo _AC('close_popup'); ?></a> | ');
}
// -->
</script>

<input type="text" name="query" /> <input type="submit" name="search" value="<?php echo _AC('search'); ?>" /> |
<a href="print.php?p=<?php echo $this_page; ?>" target="_top"><?php echo _AC('print_version'); ?></a>

<script type="text/javascript">
//<!--
document.writeln(' | ');
showTocToggle('<?php echo _AC('show_contents'); ?>' ,'<?php echo _AC('hide_contents'); ?>');
if (top.name == 'popup') {
toggleToc(true);
}
//-->
</script>

</form>
</body>
<?php
/************************************************************************/
/* AChecker */
/************************************************************************/
/* Copyright (c) 2008 - 2011 */
/* Inclusive Design Institute */
/* */
/* This program is free software. You can redistribute it and/or */
/* modify it under the terms of the GNU General Public License */
/* as published by the Free Software Foundation. */
/************************************************************************/
// $Id$

define('AC_INCLUDE_PATH', '../include/');
include(AC_INCLUDE_PATH.'vitals.inc.php');

if (isset($_GET['p'])) {
$this_page = htmlentities($_GET['p']);
} else {
exit;
}

?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo DEFAULT_LANGUAGE_CODE; ?>" lang="<?php echo DEFAULT_LANGUAGE_CODE; ?>">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php echo _AC('achecker_documentation'); ?></title>
<style type="text/css">
body { font-family: Verdana,Arial,sans-serif; font-size: x-small; margin: 0px; padding: 3px; background: #f4f4f4; color: #afafaf; }
ul, ol { list-style: none; padding-left: 0px; margin-left: -15px; }
li { margin-left: 19pt; padding-top: 2px; }
a { text-decoration: none; }
a:link, a:visited { color: #006699; }
a:hover { color: #66AECC; }
input { border: 0px; padding: 2px 5px 2px 5px; }
input[type=submit] { background-color: #dfdfdf; padding: 1px; border: #AAA solid 1px; }
input[type=submit]:hover { color: blue; background-color: #eee; padding: 1px; }
form { padding: 0px; margin: 0px; display: inline; }
</style>
<script type="text/javascript">
// <!--
var currentPage;

function showTocToggle(show, hide) {
if(document.getElementById) {
document.writeln('<a href="javascript:toggleToc(false)">' +
'<span id="showlink" style="display:none;">' + show + '</span>' +
'<span id="hidelink">' + hide + '</span>' + '</a>');
}
}
function toggleToc(override) {
var showlink=document.getElementById('showlink');
var hidelink=document.getElementById('hidelink');

if (override && (hidelink.style.display == 'none')) {
top.show();
hidelink.style.display='';
showlink.style.display='none';
} else if (!override && (hidelink.style.display == 'none')) {
top.show();
hidelink.style.display='';
showlink.style.display='none';
} else if (!override) {
top.hide(); //('0, *');
hidelink.style.display='none';
showlink.style.display='';
}
}
// -->
</script>
</head>
<body><form method="get" action="search.php" target="toc" onsubmit='toggleToc(true);false;'>
<input type="hidden" name="p" value="<?php echo $this_page; ?>">

<script type="text/javascript">
// <!--
if (top.name == 'popup') {
document.write('<a href="javascript:top.close();"><?php echo _AC('close_popup'); ?></a> | ');
}
// -->
</script>

<input type="text" name="query" /> <input type="submit" name="search" value="<?php echo _AC('search'); ?>" /> |
<a href="print.php?p=<?php echo $this_page; ?>" target="_top"><?php echo _AC('print_version'); ?></a>

<script type="text/javascript">
//<!--
document.writeln(' | ');
showTocToggle('<?php echo _AC('show_contents'); ?>' ,'<?php echo _AC('hide_contents'); ?>');
if (top.name == 'popup') {
toggleToc(true);
}
//-->
</script>

</form>
</body>
</html>
10 changes: 8 additions & 2 deletions documentation/frame_toc.php
View file
Expand Up @@ -40,9 +40,15 @@ function hb_print_toc($handbook_pages) {
}
echo '</ul>';
}

if ($missing_lang) {
$html_lang = DEFAULT_LANGUAGE_CODE;
} else {
$html_lang = $req_lang;
}
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict //EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html lang="<?php if ($missing_lang) { echo DEFAULT_LANGUAGE_CODE; } else { echo $req_lang; } ?>">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $html_lang; ?>" lang="<?php echo $html_lang; ?>">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php _AC('handbook_toc'); ?></title>
Expand Down
4 changes: 2 additions & 2 deletions documentation/print.php
View file
Expand Up @@ -44,8 +44,8 @@ function print_handbook($handbook_pages)
}
}
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict //EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html lang="<?php echo DEFAULT_LANGUAGE_CODE; ?>">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo DEFAULT_LANGUAGE_CODE; ?>" lang="<?php echo DEFAULT_LANGUAGE_CODE; ?>">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php echo _AC('doc_title'); ?></title>
Expand Down

0 comments on commit 2877532

Please sign in to comment.