cvs: phpweb /include layout.inc shared-manual.inc

bjori Sat Jan 13 19:33:54 2007 UTC Modified files: /phpweb/include shared-manual.inc layout.inc Log: Implement <link rel=contents/index/prev/next> for the manual #Fixed vim modeline to expand tabs to spaces http://cvs.php.net/viewvc.cgi/phpweb/include/shared-manual.inc?r1=1.230&r2=1.231&diff_format=u Index: phpweb/include/shared-manual.inc diff -u phpweb/include/shared-manual.inc:1.230 phpweb/include/shared-manual.inc:1.231 --- phpweb/include/shared-manual.inc:1.230 Thu Jan 11 18:22:45 2007 +++ phpweb/include/shared-manual.inc Sat Jan 13 19:33:53 2007 @@ -1,6 +1,6 @@ <?php // -*- C++ -*- -// $Id: shared-manual.inc,v 1.230 2007/01/11 18:22:45 bjori Exp $ +// $Id: shared-manual.inc,v 1.231 2007/01/13 19:33:53 bjori Exp $ /* @@ -32,7 +32,6 @@ // Print out HTTP headers and the HTML header // for this manual page, according to details // already set up -// TODO: prev/next <link> tags into <head> // TODO: replace logo with logos/php-med-trans-light.gif on print function manual_header() { @@ -54,7 +53,13 @@ $_SERVER['BASE_HREF'] = $MYSITE . $_SERVER['BASE_PAGE']; manual_sidebar(); - site_header("$title - Manual"); + $link = array( + "contents" => $PGI["home"][0], + "index" => $PGI["up"][0], + "prev" => $PGI["prev"][0], + "next" => $PGI["next"][0], + ); + site_header("$title - Manual", array("link" => $link)); manual_navbar(); } http://cvs.php.net/viewvc.cgi/phpweb/include/layout.inc?r1=1.255&r2=1.256&diff_format=u Index: phpweb/include/layout.inc diff -u phpweb/include/layout.inc:1.255 phpweb/include/layout.inc:1.256 --- phpweb/include/layout.inc:1.255 Wed Jan 3 23:19:19 2007 +++ phpweb/include/layout.inc Sat Jan 13 19:33:54 2007 @@ -1,5 +1,5 @@ <?php -/* $Id: layout.inc,v 1.255 2007/01/03 23:19:19 jacques Exp $ */ +/* $Id: layout.inc,v 1.256 2007/01/13 19:33:54 bjori Exp $ */ // Set the static content root differently on php.net $_SERVER['STATIC_ROOT'] = ($MYSITE == 'http://www.php.net/') ? @@ -94,6 +94,16 @@ $lang_input = "\n <input type=\"hidden\" name=\"lang\" value=\"$EXPL_LANG\" />"; } + // Link tags + $link = ""; + if (isset($config['link']) && is_array($config['link'])) { + foreach($config['link'] as $rel => $url) { + if ($url) { + $link .= "\n <link rel=\"$rel\" href=\"$url\" />"; + } + } + } + // Base href setting for URL shortcuts to work if (!empty($_SERVER['BASE_HREF'])) { $base = "\n <base href=\"{$_SERVER['BASE_HREF']}\" />"; @@ -133,7 +143,7 @@ </style> <!--[if IE]><![endif]><![endif]--> <meta http-equiv="Content-Type" content="text/html; charset={$config['charset']}"/> - <link rel="shortcut icon" href="{$_SERVER['STATIC_ROOT']}/favicon.ico" /> + <link rel="shortcut icon" href="{$_SERVER['STATIC_ROOT']}/favicon.ico" />{$link} <script type="text/javascript" src="{$_SERVER['STATIC_ROOT']}/userprefs.js"></script>{$base}{$meta}{$moreheadtags} </head> <body{$onload}> @@ -574,4 +584,4 @@ $SIDEBAR_DATA .= '</ul>'; } -/* vim: set noet ts=4 sw=4 ft=php: : */ +/* vim: set et ts=4 sw=4 ft=php: : */