kennyt Tue Feb 17 21:15:45 2004 EDT
Modified files:
/livedocs/themes/php.net html_format.php livedoc.css
Log:
Make livedocs' php.net template nearly pass as the original manual
section, complete with notes.
http://cvs.php.net/diff.php/livedocs/themes/php.net/html_format.php?r1=1.3&r2=1.4&ty=u
Index: livedocs/themes/php.net/html_format.php
diff -u livedocs/themes/php.net/html_format.php:1.3
livedocs/themes/php.net/html_format.php:1.4
--- livedocs/themes/php.net/html_format.php:1.3 Mon Feb 16 15:11:49 2004
+++ livedocs/themes/php.net/html_format.php Tue Feb 17 21:15:45 2004
@@ -18,24 +18,64 @@
// | headers and footers for the HTML rendering |
// +----------------------------------------------------------------------+
//
-// $Id: html_format.php,v 1.3 2004/02/16 20:11:49 derick Exp $
+// $Id: html_format.php,v 1.4 2004/02/18 02:15:45 kennyt Exp $
// in livedoc.php
-
+include_once $_SERVER['DOCUMENT_ROOT'] . '/include/shared-manual.inc';
function manual_page_header()
{
- global $lang, $title, $css_url;
+ global $lang, $title, $css_url, $nav;
$head =<<<HEAD
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
<html lang="$lang">
<head>
-<title>$title</title>
+<title>PHP: $title - Manual</title>
+<link rel="stylesheet" href="/style.css" />
+<link rel="stylesheet" href="/styles/mirror.css" />
<link rel="stylesheet" href="$css_url" />
+<link rel="shortcut icon" href="/favicon.ico" />
+<script language="Javascript" type="text/javascript" src="/userprefs.js" />
</head>
<body>
<table border="0" cellpadding="0" cellspacing="0" width="100%">
-<tr><td height="1"></td><td rowspan="2" valign="top">
+ <tr bgcolor="#9999cc">
+ <td align="center" rowspan="2" width="126"><a href="/"><img src="/images/php.gif"
alt="PHP" width="120" height="67" hspace="3" /></a></td>
+ <td> </td>
+ </tr>
+ <tr bgcolor="#9999cc">
+ <td align="right" valign="bottom">
+ <a href="/downloads.php" class="small">downloads</a> | <a href="/docs.php"
class="small">documentation</a> | <a href="/FAQ.php" class="small">faq</a> | <a
href="/support.php" class="small">getting help</a> | <a href="/mailing-lists.php"
class="small">mailing lists</a> | <a href="http://bugs.php.net/";
class="small">reporting bugs</a> | <a href="/sites.php" class="small">php.net
sites</a> | <a href="/links.php" class="small">links</a> | <a href="/my.php"
class="small">my php.net</a>
+ </td>
+ </tr>
+ <tr bgcolor="#333366"><td colspan="2"><img src="/images/spacer.gif" width="1"
height="1" border="0" alt="" /></td></tr>
+ <tr bgcolor="#666699">
+ <td align="right" valign="top" colspan="2" class="quicksearch">
+ <form method="post" action="/search.php" class="thin" name="topsearch">
+ <small><span title="Keyboard shortcut: Alt+S (Win), Ctrl+S (Apple)"><u>s</u>earch
for</span></small>
+ <input class="small" type="text" name="pattern" value="" size="30" accesskey="s" />
+ <small>in the</small>
+ <select name="show" class="small">
+ <option value="quickref" selected="selected">function list</option>
+ <option value="wholesite">whole site</option>
+ <option value="manual">online documentation [en]</option>
+ <option value="bugdb">bug database</option>
+ <option value="maillist">general mailing list</option>
+ <option value="devlist">developer mailing list</option>
+ <option value="phpdoc">documentation mailing list </option>
+ </select>
+ <input type="image" src="/images/small_submit_white.gif" alt="search"
align="bottom" />
+ </form>
+ </td>
+ </tr>
+ <tr bgcolor="#333366"><td colspan="3"><img src="/images/spacer.gif" width="1"
height="1" border="0" alt="" /></td></tr>
+</table>
+<table>
+ <tr>
+ <td valign="top" bgcolor="#f0f0f0" width="200">
+ <table><tr><td class="sidebar">$nav</td></tr></table>
+ </td>
+ <td valign="top" class="ref">
HEAD;
return $head;
@@ -43,20 +83,20 @@
function manual_page_footer()
{
- global $filename, $file_revision, $date, $nav;
+ global $filename, $file_revision, $date, $title, $current_page;
+
+ manual_setup(array('this' => array($current_page . '.php', $title)));
+
+ @manual_notes(); // broken in phpweb...
$foot =<<<FOOT
<br />
<div class='footer'>$filename $file_revision | generated: $date</div>
</td></tr>
-<tr><td valign="top">
-$nav
-</td></tr></table>
+</table>
</body>
</html>
FOOT;
-
return $foot;
-
}
// in search.php
http://cvs.php.net/diff.php/livedocs/themes/php.net/livedoc.css?r1=1.2&r2=1.3&ty=u
Index: livedocs/themes/php.net/livedoc.css
diff -u livedocs/themes/php.net/livedoc.css:1.2 livedocs/themes/php.net/livedoc.css:1.3
--- livedocs/themes/php.net/livedoc.css:1.2 Sat Jan 24 15:19:21 2004
+++ livedocs/themes/php.net/livedoc.css Tue Feb 17 21:15:45 2004
@@ -1,4 +1,4 @@
-/* $Id: livedoc.css,v 1.2 2004/01/24 20:19:21 nlopess Exp $ */
+/* $Id: livedoc.css,v 1.3 2004/02/18 02:15:45 kennyt Exp $ */
body {
font-family: verdana;
font-size: 11pt;
@@ -15,6 +15,10 @@
font-size: 1em;
}
+td.ref {
+ padding-left: 1ex;
+}
+
div.author, h4.author {
margin-top: 0px;
margin-bottom: 2px;
@@ -173,6 +177,11 @@
font-size: 7pt;
}
+table {
+ border-collapse: collapse;
+ border-padding: none;
+}
+
table.table, table.informaltable {
border: solid 2px #cccccc;
border-collapse: collapse;
