cvs: docweb /include lib_general.inc.php /www/rfc rfc-overview.php rfc-proposal-edit.php rfc-proposal-show.php

vincent Thu Aug 26 15:07:41 2004 EDT Modified files: /docweb/include lib_general.inc.php /docweb/www/rfc rfc-overview.php rfc-proposal-edit.php rfc-proposal-show.php Log: Mainly XHTML fixes http://cvs.php.net/diff.php/docweb/include/lib_general.inc.php?r1=1.9&r2=1.10&ty=u Index: docweb/include/lib_general.inc.php diff -u docweb/include/lib_general.inc.php:1.9 docweb/include/lib_general.inc.php:1.10 --- docweb/include/lib_general.inc.php:1.9 Wed Aug 18 17:23:02 2004 +++ docweb/include/lib_general.inc.php Thu Aug 26 15:07:41 2004 @@ -17,7 +17,7 @@ | Mehdi Achour <didou@php.net> | | Gabor Hojtsy <goba@php.net> | +----------------------------------------------------------------------+ -$Id: lib_general.inc.php,v 1.9 2004/08/18 21:23:02 vincent Exp $ +$Id: lib_general.inc.php,v 1.10 2004/08/26 19:07:41 vincent Exp $ */ error_reporting(E_ALL); @@ -113,21 +113,33 @@ return $GLOBALS['PROJECTS'][$project][1]; } -function site_header($title = '') +function site_header($title = '', $style = array()) { $lang = 'en'; //LANGC; $master_url = get_resource_url(); $encoding = "iso-8859-1"; // for now $page_title = ($title ? $title . ' - PHP Documentations' : 'PHP Documentations'); - $page_h1 = ($title ? "<h1>$title</h1>" : '<h1>PHP Documentations</h1>'); + $page_h1 = ($title ? $title : 'PHP Documentations'); $languages = site_nav_langs(); $projects = site_nav_projects(); $langdisplay = $GLOBALS['LANGUAGES'][LANGC]; $projdisplay = $GLOBALS['PROJECTS'][SITE][0]; + // this will prevent 404 errors + $project = (in_array(SITE, array('www', 'pecl', 'livedocs')) ? 'php' : SITE); $locallinks = site_nav_provider(); $extlinks = ext_nav_provider(); + + $extra_style = ''; + // prevent errors + $guess_style = (in_array(SITE, array('www', 'livedocs', 'pecl')) ? '' : SITE . '.css'); + $styles = ($style ? array($style) : array($guess_style)); + foreach ($styles as $style_file) { + if (!empty($style_file)) { + $extra_style .= '@import url(' . $master_url . 'style/'. $style_file .");\n"; + } + } // Set proper encoding with HTTP header first header("Content-type: text/html; charset=$encoding"); @@ -141,7 +153,10 @@ <meta http-equiv="Content-Script-Type" content="text/javascript" /> <meta http-equiv="Content-Style-Type" content="text/css" /> <meta http-equiv="Content-Language" content="$lang" /> - <style type="text/css">@import url({$master_url}style/site.css);</style> + <link rel="shortcut icon" href="{$master_url}images/favicon/{$project}/favicon.ico" /> + <style type="text/css">@import url({$master_url}style/site.css); + $extra_style</style> + </head> <body> <div id="header"> @@ -187,10 +202,10 @@ $navlist = ''; foreach ($GLOBALS['LANGUAGES'] as $code => $name) { if ($code == 'all') { - $navlist .= '<a href="' . get_insite_address(NULL, 'all') . '">All</a> '; + $navlist .= '<a href="' . get_insite_address(NULL, 'all') . '">All</a> '."\n"; } else { - $navlist .= '<a href="' . get_insite_address(NULL, $code) . '" title="' . $name . '"><img src="' . get_resource_url("images/flags/$code.png") . '"></a> '; + $navlist .= '<a href="' . get_insite_address(NULL, $code) . '" title="' . $name . '" ><img src="' . get_resource_url("images/flags/$code.png") . '" alt="' . $name . '" /></a>'."\n"; } } return $navlist; @@ -204,7 +219,7 @@ <div id="footer"> <p> <a href="{$master}copyright.php">Copyright</a> 2004 The PHP Documentation Teams - All rights reserved. - <p> + </p> <p> <a href="{$master}credits.php">Credits</a> | <a href="{$master}contact.php">Contact</a> </p> http://cvs.php.net/diff.php/docweb/www/rfc/rfc-overview.php?r1=1.1&r2=1.2&ty=u Index: docweb/www/rfc/rfc-overview.php diff -u docweb/www/rfc/rfc-overview.php:1.1 docweb/www/rfc/rfc-overview.php:1.2 --- docweb/www/rfc/rfc-overview.php:1.1 Wed Aug 18 17:28:35 2004 +++ docweb/www/rfc/rfc-overview.php Thu Aug 26 15:07:41 2004 @@ -22,7 +22,7 @@ * @author Daniel Convissor <danielc@php.net> * @copyright Copyright (c) 1997-2004 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License - * @version $Id: rfc-overview.php,v 1.1 2004/08/18 21:28:35 vincent Exp $ + * @version $Id: rfc-overview.php,v 1.2 2004/08/26 19:07:41 vincent Exp $ */ /** @@ -56,19 +56,21 @@ $form->display(); -echo "<ul>"; - $last_status = false; +$first_loop = true; foreach ($proposals as $proposal) { if ($proposal->getStatus() != $last_status) { - echo "</ul>\n"; + if ($first_loop != true) { + echo "</ul>\n"; + } echo '<h2 name="' . $proposal->getStatus() . '" id="'; echo $proposal->getStatus() . '">'; echo '&raquo; ' . htmlspecialchars($proposal->getStatus(true)); echo "</h2>\n"; echo "<ul>\n"; $last_status = $proposal->getStatus(); + $first_loop = false; } if (!isset($users[$proposal->user_handle])) { $users[$proposal->user_handle] = array('Test','name'=>'TestUser');// user::info($proposal->user_handle); // !!! http://cvs.php.net/diff.php/docweb/www/rfc/rfc-proposal-edit.php?r1=1.6&r2=1.7&ty=u Index: docweb/www/rfc/rfc-proposal-edit.php diff -u docweb/www/rfc/rfc-proposal-edit.php:1.6 docweb/www/rfc/rfc-proposal-edit.php:1.7 --- docweb/www/rfc/rfc-proposal-edit.php:1.6 Mon Aug 23 06:31:05 2004 +++ docweb/www/rfc/rfc-proposal-edit.php Thu Aug 26 15:07:41 2004 @@ -22,7 +22,7 @@ * @author Daniel Convissor <danielc@php.net> * @copyright Copyright (c) 1997-2004 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License - * @version $Id: rfc-proposal-edit.php,v 1.6 2004/08/23 10:31:05 vincent Exp $ + * @version $Id: rfc-proposal-edit.php,v 1.7 2004/08/26 19:07:41 vincent Exp $ */ /** @@ -187,9 +187,9 @@ $file = substr($hash, 0, -32); - $form->addElement('static', '', '', '<li><a href="?id='.$id.'&delete='.urlencode($hash).'">'.$file.'</a></li>'); + $form->addElement('static', '', '', '<li><a href="rfc-proposal-edit.php?id='.$id.'&amp;delete='.urlencode($hash).'">'.$file.'</a></li>'); - }; + } } http://cvs.php.net/diff.php/docweb/www/rfc/rfc-proposal-show.php?r1=1.4&r2=1.5&ty=u Index: docweb/www/rfc/rfc-proposal-show.php diff -u docweb/www/rfc/rfc-proposal-show.php:1.4 docweb/www/rfc/rfc-proposal-show.php:1.5 --- docweb/www/rfc/rfc-proposal-show.php:1.4 Wed Aug 25 07:02:59 2004 +++ docweb/www/rfc/rfc-proposal-show.php Thu Aug 26 15:07:41 2004 @@ -19,7 +19,7 @@ * @author Daniel Convissor <danielc@php.net> * @copyright Copyright (c) 1997-2004 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License - * @version $Id: rfc-proposal-show.php,v 1.4 2004/08/25 11:02:59 vincent Exp $ + * @version $Id: rfc-proposal-show.php,v 1.5 2004/08/26 19:07:41 vincent Exp $ */ /** @@ -186,7 +186,7 @@ $file = substr($hash, 0, -32); $hash = substr($hash, -32); echo ' <li>'; - print_link('?get=' . $hash, htmlspecialchars(stripslashes($file))); + print_link('rfc-proposal-show.php?get=' . $hash, htmlspecialchars(stripslashes($file))); echo "</li>\n"; } } @@ -201,6 +201,7 @@ <th class="headrow" style="width: 50%">&raquo; Timeline</th> <th class="headrow" style="width: 50%">&raquo; Changelog</th> </tr> + <tr> <td class="ulcell" valign="top"> <ul> <li>