cvs: phpweb(NEW_LOOK_2008) / index.php /images block_sprites.gif corners-left.gif corners-right.gif download-button.gif footer-back.gif
header-corners.jpg header-logo.jpg main-corners-back.gif menu-corners-back.gif news-line-back.gif note-username-back.gif note-username-back.jpg
/include layout.inc shared-manual.inc /styles base.css content.css handfield.css helpers.css ie.css mirror.css phpnet.css print.css reset.css
screen.css searchbar.css site.css
| From: | Hannes Magnusson | Date: | Sun, 17 Aug 2008 16:01:53 +0000 |
| Subject: | cvs: phpweb(NEW_LOOK_2008) / index.php /images block_sprites.gif corners-left.gif corners-right.gif download-button.gif footer-back.gif header-corners.jpg header-logo.jpg main-corners-back.gif menu-corners-back.gif news-line-back.gif note-username-back.gif note-username-back.jpg /include layout.inc shared-manual.inc /styles base.css content.css handfield.css helpers.css ie.css mirror.css phpnet.css print.css reset.css screen.css searchbar.css site.css |
||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-2446@lists.php.net to get a copy of this message | ||
bjori Sun Aug 17 16:01:53 2008 UTC
Added files: (Branch: NEW_LOOK_2008)
/phpweb/images block_sprites.gif corners-left.gif corners-right.gif
download-button.gif footer-back.gif
header-corners.jpg header-logo.jpg
main-corners-back.gif menu-corners-back.gif
news-line-back.gif note-username-back.gif
note-username-back.jpg
/phpweb/styles base.css content.css handfield.css helpers.css
ie.css reset.css screen.css
Removed files:
/phpweb/styles mirror.css phpnet.css searchbar.css site.css
Modified files:
/phpweb index.php
/phpweb/include layout.inc shared-manual.inc
/phpweb/styles print.css
Log:
Initial commit of the new design from AOE media
# Only index.php and (most of) the manual pages implemented so far
http://cvs.php.net/viewvc.cgi/phpweb/index.php?r1=1.909&r2=1.909.2.1&diff_format=u Index: phpweb/index.php diff -u phpweb/index.php:1.909 phpweb/index.php:1.909.2.1 --- phpweb/index.php:1.909 Sun May 11 19:11:37 2008 +++ phpweb/index.php Sun Aug 17 16:01:50 2008 @@ -6,6 +6,7 @@ /* ------------------------------------------------------------------------- */ +// Modified headers {{{ // Get the modification date of this PHP file $timestamps = array(@getlastmod()); @@ -41,6 +42,7 @@ else { header("Last-Modified: " . $tsstring); } +// }}} $_SERVER['BASE_PAGE'] = 'index.php'; include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc'; @@ -49,8 +51,13 @@ include_once $_SERVER['DOCUMENT_ROOT'] . '/include/pregen-news.inc'; include_once $_SERVER['DOCUMENT_ROOT'] . '/include/version.inc'; -// This goes to the left sidebar of the front page +// This goes to the left sidebar of the front page {{{ $SIDEBAR_DATA = ' +<div class="content"> + <div class="block"> + <span class="corners-top"><span></span></span> + <div class="info"> + <h3>What is PHP?</h3> <p> <acronym title="recursive acronym for PHP: Hypertext Preprocessor">PHP</acronym> @@ -62,10 +69,11 @@ and the example archive sites and some of the other resources available in the <a href="/links.php">links section</a>. </p> -<p> - Ever wondered how popular PHP is? see the - <a href="/usage.php">Netcraft Survey</a>. -</p> +</div> +</div><!-- .block--> + + <div class="block"> + <div class="info"> <h3><a href="/thanks.php">Thanks To</a></h3> <ul class="simple"> @@ -83,27 +91,21 @@ <li><a href="http://www.rackspace.com/">Rackspace</a></li> <li><a href="http://www.eukhost.com/">EUKhost</a></li> </ul> -<h3>Related sites</h3> -<ul class="simple"> - <li><a href="http://www.apache.org/">Apache</a></li> - <li><a href="http://www.mysql.com/">MySQL</a></li> - <li><a href="http://www.postgresql.org/">PostgreSQL</a></li> - <li><a href="http://www.zend.com/">Zend Technologies</a></li> -</ul> -<h3>Community</h3> -<ul class="simple"> - <li><a href="http://www.linuxfund.org/">LinuxFund.org</a></li> - <li><a href="http://www.ostg.com/">OSTG</a></li> -</ul> <h3>Syndication</h3> <p> You can grab our news as an <a href="/feed.atom">Atom feed</a>. -</p>'; +</p> + </div><!--.block--> + <span class="corners-bottom"><span></span></span> + </div> + </div> +'; +// }}} $MIRROR_IMAGE = ''; -// Try to find a sponsor image in case this is an official mirror +// Try to find a sponsor image in case this is an official mirror {{{ if (is_official_mirror()) { // Iterate through possible mirror provider logo types in priority order @@ -141,62 +143,102 @@ break; } } -} - -/* {{{ Generate latest release info */ -/* NOTE: You are editing the wrong file, you should be in include/version.inc - * For RC: See the $PHP_x_RC variable - * For STABLE: See the $PHP_x_VERSION/_DATE/_MD5 variables - */ -$PHP_5_STABLE = $PHP_4_STABLE = array(); -$PHP_5_RC = $PHP_4_RC = ""; -$rel = $rc = ""; +} // }}} +// {{{ Generate latest release info list($PHP_5_STABLE, ) = each($RELEASES[5]); -list($PHP_4_STABLE, ) = each($RELEASES[4]); - -$rel = <<< EOT - <div id="releaseBox"> - <h4>Stable Releases</h4> - <ol id="releases"> - <li class="php5"><a href="/downloads.php#v5">Current PHP 5 Stable: <span class="release">$PHP_5_STABLE</span></a></li> - <li class="php5"><a href="/downloads.php#v4">Historical PHP 4 Stable: <span class="release">$PHP_4_STABLE</span></a></li> - </ol> - </div>\n -EOT; +$PHP_5_RC = null; /* Do we have any release candidates to brag about? */ if (count($RELEASES[5])>1) { list($PHP_5_RC, ) = each($RELEASES[5]); - - if (!empty($PHP_5_RC)) { - $rc .= " <li class=\"php5\"><a href=\"http://qa.php.net/\">Current PHP 5 RC: <span class=\"release\">$PHP_5_RC</span></a></li>\n"; - } } -if (count($RELEASES[4])>1) { - list($PHP_4_RC, ) = each($RELEASES[4]); - if (!empty($PHP_4_RC)) { - $rc .= " <li class=\"php4\"><a href=\"http://qa.php.net/\">Current PHP 4 RC: <span class=\"release\">$PHP_4_RC</span></a></li>\n"; - } -} -if (!empty($rc)) { - $rel .= <<< EOT - <div id="candidateBox"> - <h4><a href="http://qa.php.net/rc.php">Release Candidates</a></h4> - <ol id="candidates"> -$rc - </ol> - </div>\n -EOT; +$release_box = <<< RELEASE_DATA + <div class="content"> + <div class="block releases"><span class="corners-top"><span></span></span> + <div class="info"> + <h3>Stable releases</h3> + <p class="first">Current PHP 5 Stable: <a href="/ChangeLog-5.php#$PHP_5_STABLE"><strong>$PHP_5_STABLE</strong></a></p> + <p class="download-button"><a href="/downloads.php#v5"><span>Download</span></a></p> + <p class="top-border">Historical PHP Stable: <a href="/downloads.php#v4"><strong>4.4.9</strong></a></p> +RELEASE_DATA; + +if ($PHP_5_RC) { + $release_box .= <<< RELEASE_DATA + <h4>Release Candidates</h4> + <p class="top-border"><a href="http://qa.php.net/">$PHP_5_RC</a></p> +RELEASE_DATA; } +$release_box .= <<< RELEASE_DATA + <p><a href="/downloads.php"><strong>Download area »</strong></a></p> + </div><!-- .info --> + </div><!--.block--> +RELEASE_DATA; /* }}} */ +// Generate the event box {{{ +$upcoming_events = <<< UPCOMING_EVENTS + <div class="block"> + <div class="info"> + <h3 class="upcoming-events">Upcoming Events</h3> + <div class="calendar"><span class="corners-top"><span></span></span> + <h4>Events Calendar</h4> + <form method="get" action="/cal.php"> + <p> + <select class="month" name="cm"> +UPCOMING_EVENTS; + +$months = array(1 => "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"); +$current = date("m", $_SERVER["REQUEST_TIME"]); +foreach($months as $n => $month) { + $upcoming_events .= "<option value='$n' ". ($n == $current ? 'selected="selected"' : '') .">$month</option>\n"; +} + +$upcoming_events .= <<< UPCOMING_EVENTS + </select> + <span><input type="submit" class="button" value="View" /></span> + </p> + </form> + <span class="corners-bottom"><span></span></span></div> + <p class="add-event"><a href="/submit-event.php"><strong>Add event »</strong></a></p> + <div class="events"> + $EVENTS_DATA + </div> + </div><!-- .calendar --> + </div><!-- .info --> + </div><!-- .block --> +UPCOMING_EVENTS; +// }}} + // Prepend mirror image & latest releases to sidebar text -$RSIDEBAR_DATA = $MIRROR_IMAGE . $rel . $RSIDEBAR_DATA; +$RSIDEBAR_DATA = $MIRROR_IMAGE . $release_box . $upcoming_events; + +// Generate conference teaser {{{ +if (is_array($CONF_TEASER) && count($CONF_TEASER)) { + $categories = array("conference" => "Upcoming conferences", "cfp" => "Calling for papers"); + $teaser = ' <li id="news-line"><span class="corners-top"><span></span></span><ul>' . "\n"; + foreach($CONF_TEASER as $k => $a) { + if (is_array($a) && count($a)) { + $teaser .= " <li><span>" . $categories[$k] . "</span>\n"; + $teaser .= " <ul>"; + $count = 0; + $a = preg_replace("'([A-Za-z0-9])([\s\:\-\,]*?)call for(.*?)$'i", "$1", $a); + foreach($a as $url => $title) { + if ($count++ >= 4) { + break; + } + $teaser .= ' <li class="first last"><a href="' . $url. '">' . $title. '</a></li>' . "\n"; + } + $teaser .= " </ul>\n </li>\n"; + } // if set + } + $teaser .= ' </ul><span class="corners-bottom"><span></span></span></li><!-- #news-line -->'."\n"; + $PRE_DATA = $teaser; +} // }}} -// Write out common header +// Write out common header {{{ site_header("Hypertext Preprocessor", array( 'onload' => 'boldEvents();', @@ -218,38 +260,21 @@ ), ) ); +// }}} -if (is_array($CONF_TEASER) && count($CONF_TEASER)) { - $categories = array("conference" => "Upcoming conferences", "cfp" => "Calling for papers"); - echo ' <div id="confTeaser">' . "\n"; - echo " <table>\n"; - foreach($CONF_TEASER as $k => $a) { - if (is_array($a) && count($a)) { - echo " <tr>\n <td valign='top' style='white-space: nowrap'>".$categories[$k].":</td>\n"; - echo " <td valign='top'>\n"; - echo ' <ul class="' .$k. '">' . "\n"; - $count = 0; - $a = preg_replace("'([A-Za-z0-9])([\s\:\-\,]*?)call for(.*?)$'i", "$1", $a); - foreach($a as $url => $title) { - if ($count++ >= 4) { - break; - } - echo ' <li><a href="' . $url. '">' . $title. '</a></li>' . "\n"; - } - echo " </ul>\n </td>\n </tr>\n"; - } // if set - } - echo " </table>\n </div>\n\n<br />\n"; -} - - +?> + <li id="mid-column"> + <div class="content"> +<?php /* Where the h*ll did all the news go? - * See archives/2007.xml + * See ./bin/createNewsEntry */ print_news($NEWS_ENTRIES, "frontpage"); ?> + <p class="t-center"><a href="/archive/index.php"><strong>News Archive</strong></a></p> + </div> + </li><!-- #mid-column--> -<p class="center"><a href="/archive/index.php">News Archive</a></p> <?php site_footer( http://cvs.php.net/viewvc.cgi/phpweb/include/layout.inc?r1=1.287&r2=1.287.2.1&diff_format=u Index: phpweb/include/layout.inc diff -u phpweb/include/layout.inc:1.287 phpweb/include/layout.inc:1.287.2.1 --- phpweb/include/layout.inc:1.287 Wed Jun 18 04:59:21 2008 +++ phpweb/include/layout.inc Sun Aug 17 16:01:51 2008 @@ -1,5 +1,5 @@ <?php -/* $Id: layout.inc,v 1.287 2008/06/18 04:59:21 philip Exp $ */ +/* $Id: layout.inc,v 1.287.2.1 2008/08/17 16:01:51 bjori Exp $ */ // Set the static content root differently on php.net $_SERVER['STATIC_ROOT'] = ($MYSITE == 'http://www.php.net/') ? @@ -60,7 +60,7 @@ function site_header($title = '', $config = array()) { - global $EXPL_LANG, $SIDEBAR_DATA, $RSIDEBAR_DATA, $PAGE_COLUMNS, $PGI; + global $EXPL_LANG, $SIDEBAR_DATA, $PAGE_COLUMNS, $PGI, $PRE_DATA; // Default to empty array if improper parameter passed if (!is_array($config)) { $config = array(); } @@ -73,7 +73,6 @@ // sidebar and no left sidebar $PAGE_COLUMNS = 1; if (!empty($SIDEBAR_DATA)) { $PAGE_COLUMNS++; } - if (!empty($RSIDEBAR_DATA)) { $PAGE_COLUMNS++; } // Print out lang and charset headers if (!isset($config["lang"])) { $config["lang"] = "en"; } @@ -166,93 +165,83 @@ print <<<END_HEADER -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head{$profile}> - <title>PHP{$title}</title> - <style type="text/css" media="all"> - @import url("{$_SERVER['STATIC_ROOT']}/styles/site.css"); - @import url("{$_SERVER['STATIC_ROOT']}/styles/{$mirror_specific_style}.css"); - </style> - <!--[if IE]><![if gte IE 6]><![endif]--> - <style type="text/css" media="print"> - @import url("{$_SERVER['STATIC_ROOT']}/styles/print.css"); - </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} - <script type="text/javascript" src="{$_SERVER['STATIC_ROOT']}/userprefs.js"></script>{$base}{$meta}{$moreheadtags} + <title>PHP{$title}</title> + <meta http-equiv="Content-Type" content="text/html; charset={$config['charset']}" /> + <link type="text/css" media="screen" rel="stylesheet" href="{$_SERVER['STATIC_ROOT']}/styles/screen.css" /> + <link type="text/css" media="print" rel="stylesheet" href="{$_SERVER['STATIC_ROOT']}/styles/print.css" /> + <link type="text/css" media="handfield" rel="stylesheet" href="{$_SERVER['STATIC_ROOT']}/styles/handfield.css" /> + <!--[if IE ]> + <link type="text/css" rel="stylesheet" media="screen" href="{$_SERVER['STATIC_ROOT']}/styles/ie.css" /> + <![endif]--> + <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}> -<div id="headnav"> - <a href="/" rel="home"><img src="{$_SERVER['STATIC_ROOT']}/images/php.gif" - alt="PHP" width="120" height="67" /></a> - <div id="headmenu"> - <a href="/downloads.php">downloads</a> | - <a href="/docs.php">documentation</a> | - <a href="/FAQ.php">faq</a> | - <a href="/support.php">getting help</a> | - <a href="/mailing-lists.php">mailing lists</a> | - <a href="http://bugs.php.net/">reporting bugs</a> | - <a href="/sites.php">php.net sites</a> | - <a href="/links.php">links</a> | - <a href="/conferences/">conferences</a> | - <a href="/my.php">my php.net</a> - </div> -</div> - -<div id="headsearch"> - <form method="post" action="/search.php" id="topsearch"> - <p> - <span title="Keyboard shortcut: Alt+S (Win), Ctrl+S (Apple)"> - <span class="shortkey">s</span>earch for - </span> - <input type="text" name="pattern" value="" size="30" accesskey="s" /> - <span>in the</span> - <select name="show"> - <option value="quickref" selected="selected">function list</option> - <option value="all" >all php.net sites</option> - <option value="local" >this mirror only</option> - <option value="manual" >online documentation</option> - <option value="bugdb" >bug database</option> - <option value="news_archive">Site News Archive</option> - <option value="changelogs">All Changelogs</option> - <option value="pear" >just pear.php.net</option> - <option value="pecl" >just pecl.php.net</option> - <option value="talks" >just talks.php.net</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="{$_SERVER['STATIC_ROOT']}/images/small_submit_white.gif" - class="submit" alt="search" />{$lang_input} - </p> - </form> -</div> +<body id="homepage"> + <ul id="root"> + <li id="header"> + <div class="content"> + <h1><a href="/index.php">PHP: Hypertext Preprocessor</a></h1> + <form method="post" action="/search.php" id="topsearch"> + <div id="search-box"> + <label>Search for</label> + <span><input type="text" class="text" maxlength="20" name="pattern" /></span> + <label>in the</label> + <span> + <select name="show"> + <option value="quickref" selected="selected">function list</option> + <option value="all" >all php.net sites</option> + <option value="local" >this mirror only</option> + <option value="manual" >online documentation</option> + <option value="bugdb" >bug database</option> + <option value="news_archive">Site News Archive</option> + <option value="changelogs" >All Changelogs</option> + <option value="pear" >just pear.php.net</option> + <option value="pecl" >just pecl.php.net</option> + <option value="talks" >just talks.php.net</option> + <option value="maillist" >general mailing list</option> + <option value="devlist" >developer mailing list</option> + <option value="phpdoc" >documentation mailing list</option> + </select> + </span> + <span><input type="submit" class="button" value="Search" /></span> + </div> + </form> + </div> + </li><!--#header--> + <li id="main-menu"> + <ul id="top-navigation"> + <li class="first"><a href="/downloads.php">Downloads</a></li> + <li><a href="/docs.php">Documentation</a></li> + <li><a href="/FAQ.php">Faq</a></li> + <li><a href="/support.php">Getting Help</a></li> + <li><a href="/mailing-lists.php">Mailing Lists</a></li> + <li><a href="http://bugs.php.net">Reporting Bugs</a></li> + <li><a href="/sites.php">Php.net Sites</a></li> + <li><a href="/links.php">Links</a></li> + <li><a href="/conferences/">Conferences</a></li> + <li class="last"><a href="/my.php">My Php.net</a></li> + </ul> + </li><!--#main-menu--> -<div id="layout_{$PAGE_COLUMNS}">{$layout_helper} END_HEADER; + echo $PRE_DATA; + // Print out left column if ($PAGE_COLUMNS > 1) { - echo "\n <div id=\"leftbar\">\n$SIDEBAR_DATA\n </div>"; +echo ' + <li id="content"> + <ul id="content-columns"> + <li id="left-column"> + ' . $SIDEBAR_DATA . ' + </li>'; } - // Print out right column - if ($PAGE_COLUMNS > 2) { - echo "\n <div id=\"rightbar\">\n$RSIDEBAR_DATA\n </div>"; - } - - // Any layout workarounds? - if (!empty($config["layout_workaround"])) { - echo $config["layout_workaround"]; - } - - // Start main page content - echo "\n <div id=\"content\" class=\"$classname\"{$rtl}>\n"; } // Stats pages still need this @@ -260,17 +249,17 @@ function site_footer($config = array()) { - global $LAST_UPDATED, $PAGE_COLUMNS; + global $LAST_UPDATED, $PAGE_COLUMNS, $RSIDEBAR_DATA; - $stats = (have_stats() ? "\n <a href=\"/stats/\">stats</a> |" : ""); + $stats = (have_stats() ? "\n <li><a href=\"/stats/\">stats</a></li>" : ""); $rsslink = (isset($config["rss"]) ? - "<a href=\"{$config["rss"]}\">RSS</a> |" : + "<li><a href=\"{$config["rss"]}\">RSS</a></li>" : ""); $atomlink = (isset($config["atom"]) ? - "<a href=\"{$config["atom"]}\">Atom</a> |" : + "<li><a href=\"{$config["atom"]}\">Atom</a></li>" : ""); $viewsource = (isset($_SERVER['BASE_PAGE']) ? - "<a href=\"/source.php?url=/{$_SERVER['BASE_PAGE']}\">show source</a> |" : + "<li><a href=\"/source.php?url=/{$_SERVER['BASE_PAGE']}\">show source</a></li>" : ""); $provider_url = mirror_provider_url(); $provider_name = mirror_provider(); @@ -278,36 +267,40 @@ "<a href=\"/mirror.php\">This mirror</a> generously provided by:" : "<a href=\"/mirror.php\">This unofficial mirror</a> is operated at:"); $last_updated = strftime("%c %Z", $LAST_UPDATED); - $layout_helper = ($PAGE_COLUMNS > 2 ? "</div>" : ""); //$functionsjs = (in_array("functionsjs", $config) ? "\n<script src=\"" . $_SERVER['STATIC_ROOT'] . '/functions.js" type="text/javascript"></script>' : ''); + // Print out right column + if ($RSIDEBAR_DATA) { +echo ' + <li id="right-column"> + ' . $RSIDEBAR_DATA . ' + </li>'; + } + print <<<END_FOOTER - </div> - <div class="cleaner"> </div> -{$layout_helper}</div> - -<div id="footnav"> - $rsslink $atomlink $viewsource - <a href="/credits.php">credits</a> |$stats - <a href="/sitemap.php">sitemap</a> | - <a href="/contact.php">contact</a> | - <a href="/contact.php#ads">advertising</a> | - <a href="/mirrors.php">mirror sites</a> -</div> - -<div id="pagefooter"> - <div id="copyright"> - <a href="/copyright.php">Copyright © 2001-2008 The PHP Group</a><br /> - All rights reserved. - </div> - - <div id="thismirror"> - {$mirror_text} - <a href="{$provider_url}">{$provider_name}</a><br /> - Last updated: {$last_updated} - </div> -</div> + </ul> <!-- #content-columns --> + </li> <!-- #content --> + <li id="footer"><span class="corners-top"><span></span></span> + <div class="info"> + <div id="copyright"><a href="/copyright.php">Copyright © 2001-2008 The PHP Group</a><br />All rights reserved.</div> + <div id="footer-menu"> + <ul> + $rsslink $atomlink $viewsource + <li><a href="/credits.php">Credits</a></li> + $stats + <li><a href="/stats/">Stats</a></li> + <li><a href="/sitemap.php">Sitemap</a></li> + <li><a href="/contact.php">Contact</a></li> + <li><a href="/contact.php#ads">Advertising</a></li> + <li class="last"><a href="/mirrors.php">Mirror sites</a></li> + </ul><br /> + <small>{$mirror_text} <a href="{$provider_url}">{$provider_name}</a> Last updated: {$last_updated}</small> + </div> + </div> + <span class="corners-bottom"><span></span></span> + </li><!--#footer--> + </ul><!--#root--> </body> </html> @@ -699,16 +692,14 @@ $newsdate = date("d-M-Y", strtotime($published)); echo <<< EOT -<div class="newsItem hentry{$vevent}"> - <div class="newsImage">{$image}</div> - <h1 class="summary entry-title"><a name="{$id}" id="{$id}" href="{$permlink}" rel="bookmark" class="bookmark">{$item["title"]}</a></h1> - <div class="entry-content description"> - <abbr class="published newsdate" title="{$item["published"]}">[{$newsdate}]</abbr> - {$item["content"]} + <div class="block"><span class="corners-top"><span></span></span> + <div class="info hentry{$vevent}"> + <h3 class="summary entry-title"><a name="{$id}" id="{$id}" href="{$permlink}" rel="bookmark" class="bookmark">{$item["title"]}</a></h3> + <p class="news-date"><abbr class="published newsdate" title="{$item["published"]}">$newsdate</abbr></p> + <div class="newsImage">{$image}</div> + {$item["content"]} </div> -</div> - -<hr /> + </div><!--.block--> EOT; } http://cvs.php.net/viewvc.cgi/phpweb/include/shared-manual.inc?r1=1.240&r2=1.240.2.1&diff_format=u Index: phpweb/include/shared-manual.inc diff -u phpweb/include/shared-manual.inc:1.240 phpweb/include/shared-manual.inc:1.240.2.1 --- phpweb/include/shared-manual.inc:1.240 Thu Apr 10 18:41:13 2008 +++ phpweb/include/shared-manual.inc Sun Aug 17 16:01:51 2008 @@ -1,6 +1,6 @@ <?php // -*- C++ -*- -// $Id: shared-manual.inc,v 1.240 2008/04/10 18:41:13 philip Exp $ +// $Id: shared-manual.inc,v 1.240.2.1 2008/08/17 16:01:51 bjori Exp $ /* @@ -26,10 +26,10 @@ { global $PGI; $PGI = array_merge($PGI, $page_data); // merge for BC reasons - + // Set base page for this manual page $_SERVER['BASE_PAGE'] = 'manual/' . language_convert($PGI['head'][1]) . "/" . $PGI['this'][0]; - + // Set last modification time on the current manual page if (($time = @filemtime($_SERVER['DOCUMENT_ROOT'] ."/". $_SERVER['BASE_PAGE'])) != false) { $PGI['lastmod'] = gmdate("D, d M Y", $time); @@ -41,25 +41,24 @@ // Print out HTTP headers and the HTML header // for this manual page, according to details // already set up -// TODO: replace logo with logos/php-med-trans-light.gif on print function manual_header() { global $PGI, $LAST_UPDATED, $MYSITE; - + // Get values out of the config array $title = $PGI['this'][1]; list($encoding, $lang) = $PGI['head']; - + header("Last-Modified: " . gmdate("D, d M Y H:i:s ", $LAST_UPDATED) . "GMT"); //header("Cache-Control: public, max-age=600"); header("Vary: Cookie"); //header("Content-type: text/html;charset=$encoding"); header("Content-type: text/html;charset=utf-8"); header("Content-language: $lang"); - + // Set base href for this manual page $_SERVER['BASE_HREF'] = $MYSITE . $_SERVER['BASE_PAGE']; - + manual_sidebar(); site_header("$title - Manual", array( "link" => array( @@ -72,7 +71,22 @@ ), "profile" => "http://purl.org/NET/erdf/profile", )); + echo <<< MAIN_CONTENT + <li id="main-column"> + <div class="content"> +MAIN_CONTENT; + manual_navbar(); + +echo <<< MAIN_CONTENT + + <div class="block"><span class="corners-top"><span></span></span> + <div class="info"> + <p class="func-date">Last updated: <span>{$PGI['lastmod']}</span></p> + + +MAIN_CONTENT; + } // Print out manual page footer @@ -83,10 +97,18 @@ // Get vars for easy handling list($filename, $title) = $PGI['this']; - echo "<br /><br />"; + echo "</div><!-- .info -->\n"; + echo '<span class="corners-bottom"><span></span></span></div><!--.block-->'; + + manual_notes(); - echo "<br />"; + manual_navbar("bottom"); + echo <<< MAIN_CONTENT + </div> <!-- .content --> + </li><!-- #main-column--> +MAIN_CONTENT; + site_footer(); } @@ -100,7 +122,13 @@ global $PGI, $SIDEBAR_DATA; // Start sidebar with its <div> - $BAR = "<!--UdmComment-->\n<ul class=\"toc\">\n"; + $BAR = <<< SIDEBAR + <div class="content"> + <div class="block"><span class="corners-top"><span></span></span> + <div class="info"> + <h3>PHP Manual</h3> + <ul id="functions-list"> +SIDEBAR; // Link to manual home $BAR .= ' <li class="header home"><a href="' . $PGI['home'][0] . '">' . @@ -117,8 +145,8 @@ // Link to one page up if titles does not match if (($PGI['home'][1] !== $PGI['up'][1]) && $PGI['up'][1]) { - $BAR .= ' <li class="header up"><a href="' . $PGI['up'][0] . '">' . - $PGI['up'][1] . "</a></li>\n"; + $BAR .= ' <li class="header up sel"><a href="' . $PGI['up'][0] . '">' . + $PGI['up'][1] . "</a><ul>\n"; } // Print out one link for all siblings of this page @@ -128,7 +156,7 @@ list($url, $title) = $tocitem; // Get the proper classname to use for this <div> - $liclass = ($url == $PGI['this'][0]) ? ' class="active"' : ""; + $liclass = ($url == $PGI['this'][0]) ? ' class="sel"' : ""; // There are some very long function names, which // make the TOC too wide, so enable the browser to wrap them @@ -144,8 +172,19 @@ make_link($url, $title) . "</li>\n"; } + $close = ""; + if (($PGI['home'][1] !== $PGI['up'][1]) && $PGI['up'][1]) { + $close = "</ul></li>"; + } // Put navigation content into sidebar, end <div> - $SIDEBAR_DATA = "$BAR</ul><!--/UdmComment-->\n"; + $SIDEBAR_DATA = <<< SIDEBAR + $BAR + </ul> + </div> + <span class="corners-bottom"><span></span></span></div><!--.block--> + </div><!-- .content --> +SIDEBAR; + } function manual_navbar($location = "top") @@ -153,36 +192,27 @@ global $PGI, $LANG, $LANGUAGES, $INACTIVE_ONLINE_LANGUAGES, $ACTIVE_ONLINE_LANGUAGES; // Start navbar with - echo "<!--UdmComment-->\n<div class=\"manualnavbar manualnavbar_$location\">\n <span class=\"next\">\n"; + echo <<< NAVBAR + <div class="adv-block"><span class="corners-top"><span></span></span> +NAVBAR; + if (isset($PGI['next']) && isset($PGI['next'][1])) { - echo " <a href=\"{$PGI['next'][0]}\">" . - $PGI['next'][1] . - make_image('caret-r.gif', '>') . - "</a>\n"; + echo " <a href=\"{$PGI['next'][0]}\" class=\"next\">" . $PGI['next'][1] . "</a>\n"; } - echo " </span>\n <span class=\"prev\">\n"; if (isset($PGI['prev']) && isset($PGI['prev'][1])) { - echo " <a href=\"{$PGI['prev'][0]}\">" . - make_image('caret-l.gif', '<') . - $PGI['prev'][1] . "</a>\n"; + echo " <a href=\"{$PGI['prev'][0]}\" class=\"prev\">" . $PGI['prev'][1] . "</a>\n"; } else { echo " \n"; } - echo " </span>\n <hr />\n"; - - // Provide last updated information on this page - echo " <span class=\"lastupdated\">Last updated: {$PGI['lastmod']}</span>\n"; // Print out language switch on top of manual pages - echo " <div class=\"langchooser\">\n"; if ($location != 'bottom') { - $links = array(); // Quick access to filename $filename = $PGI['this'][0]; - - // Disable all languages without online content + + // Disable all languages without online content // Add a dropdown item for all languages left foreach ($ACTIVE_ONLINE_LANGUAGES as $code => $name) { if (!preg_match("!/$code/!", $_SERVER['BASE_PAGE']) @@ -194,22 +224,22 @@ $links[] = array('help-translate.php', 'Other'); // Print out the form with all the options - echo ' <form action="/manual/change.php" method="get">' . "\n" . - ' <p>view this page in </p><fieldset><select name="page">'. "\n"; + echo '<form action="/manual/change.php" method="get"><p>View this page in + + <select name="page">'; + foreach ($links as $link) { echo ' <option value="' . $link[0] . '">' . $link[1] . "</option>\n"; } - echo " </select>\n" . - ' <input type="image" src="' . $_SERVER['STATIC_ROOT'] . - '/images/small_submit.gif" id="changeLangImage" ' . - 'alt="" />' . "\n </fieldset></form>\n"; - + echo '</select><input type="submit" value="»" /></p></form>'; + } else { echo " \n"; } - echo " </div>\n"; - - echo "</div>\n<!--/UdmComment-->\n\n"; + echo <<< NAVBAR + <span class="corners-bottom"><span></span></span> + </div><!-- .adv-block--> +NAVBAR; } // ============================================================================= @@ -235,25 +265,25 @@ if(count($notes) > 2) { manual_navbar("bottom"); } +echo <<< MAIN_CONTENT + <div class="block"><span class="corners-top"><span></span></span> +MAIN_CONTENT; + // Link target to add a note to the current manual page, // and it's extended form with a [+] image $addnotelink = '/manual/add-note.php?sect=' . $filename . '&redirect=' . $_SERVER['BASE_HREF']; $addnotesnippet = - make_link($addnotelink, make_image('notes-add.gif', 'add a note', 'middle')) . - ' <small>' . - make_link($addnotelink, 'add a note') . - '</small>'; + '<div class="add-note">' . + make_link($addnotelink, 'Add Note') . + '</div>'; echo <<<END_USERNOTE_HEADER <div id="usernotes"> - <div class="head"> - <span class="action">{$addnotesnippet}</span> - <small>User Contributed Notes</small><br /> - <strong>{$title}</strong> - </div> + {$addnotesnippet} + <h4>User Contributed Notes</h4> END_USERNOTE_HEADER; // If we have no notes, then inform the user @@ -263,17 +293,19 @@ // If we have notes, print them out else { - + echo '<ul id="contributed-notes">'; foreach($notes as $note) { manual_note_display( $note['xwhen'], $note['user'], $note['note'], $note['id'] ); } - echo "\n <div class=\"foot\">$addnotesnippet</div>\n"; + echo "</ul>\n"; + echo $addnotesnippet; } // End of #usernotes echo "</div>"; + echo '<span class="corners-bottom"><span></span></span></div><!--.block-->'; } // Get user notes from the appropriate text dump @@ -311,7 +343,6 @@ if ($name) { $name = "\n <strong>" . htmlspecialchars($name) . "</strong><br />"; } $datestr = date("d-M-Y h:i", $date); $datestr = ($id ? "\n <a href=\"#$id\">$datestr</a>" : "\n $datestr"); - $anchor = ($id ? "<a name=\"$id\"></a>\n " : ""); $text = clean_note($text); // If the viewer is logged in, show admin options @@ -344,11 +375,16 @@ echo <<<USER_NOTE_TEXT - {$anchor}<div class="note">{$admin}{$name}{$datestr} - <div class="text"> + <li id="{$id}"> + <div class="username">{$name}<a name="#{$id}">{$datestr}</a></div> + <div class="ncontent"> + <div class="note"> + <span class="corners-top"><span></span></span> {$text} + <span class="corners-bottom"><span></span></span> + </div> </div> - </div> + </li> USER_NOTE_TEXT; } http://cvs.php.net/viewvc.cgi/phpweb/styles/print.css?r1=1.5&r2=1.5.2.1&diff_format=u Index: phpweb/styles/print.css diff -u phpweb/styles/print.css:1.5 phpweb/styles/print.css:1.5.2.1 --- phpweb/styles/print.css:1.5 Wed Sep 13 19:24:41 2006 +++ phpweb/styles/print.css Sun Aug 17 16:01:51 2008 @@ -1,22 +1,89 @@ -#headmenu, #headsearch, #leftbar, #rightbar, #footnav, #thismirror, -.manualnavbar .next, .manualnavbar .prev, .manualnavbar .langchooser, -.manualnavbar hr, .manualnavbar_bottom, #usernotes .action, #usernotes .foot { - display: none; -} - -#layout_2 #content, #layout_3 #content { - width: 100%; - margin: 0; -} +body { + margin:.2in .55in; + padding:0; + font:12pt "Times New Roman", serif; + } -#headnav, #layout_2, #layout_3, #layout_3_helper, div.manualnavbar { - background: none; +/* Hide and reset blocks + *******************************/ +#mid-column, +#main-column, +#right-column, +#header, +#content { + margin:0; + list-style:none; + } -#headnav { - float: right; +#left-column, +#footer, +.adv-block, +#main-menu, +#search-box, +#news-line, +.releases, +.calendar, +.add-event, +.add-note { + display:none; } -#usernotes .note, #usernotes { - border-top: 1px solid black; -} +/* Links decoration + *******************************/ +a { + color:black; + text-decoration:none; + } +a img { + border-width:0; + } + +/* Headings + *******************************/ +h1, h2, h3,h4 { + margin:1em 0 .5em; + font-family:Georgia,Serif; + font-weight:normal; + clear:both; + } + h1 { + margin-top:.5em; + font-size:180%; + } + h2 { + font-size:240%; + margin:.3em 0 0 0; + padding-bottom:0; + } + h3 { + font-size:150%; + margin-bottom:0; + } + + h4 { + font-size:120%; + margin-bottom:0; + } +p{ + margin:0 0 .6em 0; + } +blockquote{ + font-style:italic; + } +h3+blockquote, h2+blockquote, p+ul, h2+ul, h3+ul{ + margin-top:.2em; + } + +/* Etc + *******************************/ +.content a[href]:after, +.secondary a[href]:after, +#footer a[href]:after { + content: " (" attr(href) ") "; + font-size: 90%; + } +.content a[href^="/"]:after, +.secondary a[href^="/"]:after { + content: " (http://php.net/" attr(href) ") "; + } \ No newline at end of file http://cvs.php.net/viewvc.cgi/phpweb/styles/base.css?view=markup&rev=1.1 Index: phpweb/styles/base.css +++ phpweb/styles/base.css http://cvs.php.net/viewvc.cgi/phpweb/styles/content.css?view=markup&rev=1.1 Index: phpweb/styles/content.css +++ phpweb/styles/content.css http://cvs.php.net/viewvc.cgi/phpweb/styles/handfield.css?view=markup&rev=1.1 Index: phpweb/styles/handfield.css +++ phpweb/styles/handfield.css http://cvs.php.net/viewvc.cgi/phpweb/styles/helpers.css?view=markup&rev=1.1 Index: phpweb/styles/helpers.css +++ phpweb/styles/helpers.css http://cvs.php.net/viewvc.cgi/phpweb/styles/ie.css?view=markup&rev=1.1 Index: phpweb/styles/ie.css +++ phpweb/styles/ie.css http://cvs.php.net/viewvc.cgi/phpweb/styles/reset.css?view=markup&rev=1.1 Index: phpweb/styles/reset.css +++ phpweb/styles/reset.css http://cvs.php.net/viewvc.cgi/phpweb/styles/screen.css?view=markup&rev=1.1 Index: phpweb/styles/screen.css +++ phpweb/styles/screen.css
http://cvs.php.net/viewvc.cgi/phpweb/index.php?r1=1.909&r2=1.909.2.1&diff_format=u Index: phpweb/index.php diff -u phpweb/index.php:1.909 phpweb/index.php:1.909.2.1 --- phpweb/index.php:1.909 Sun May 11 19:11:37 2008 +++ phpweb/index.php Sun Aug 17 16:01:50 2008 @@ -6,6 +6,7 @@ /* ------------------------------------------------------------------------- */ +// Modified headers {{{ // Get the modification date of this PHP file $timestamps = array(@getlastmod()); @@ -41,6 +42,7 @@ else { header("Last-Modified: " . $tsstring); } +// }}} $_SERVER['BASE_PAGE'] = 'index.php'; include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc'; @@ -49,8 +51,13 @@ include_once $_SERVER['DOCUMENT_ROOT'] . '/include/pregen-news.inc'; include_once $_SERVER['DOCUMENT_ROOT'] . '/include/version.inc'; -// This goes to the left sidebar of the front page +// This goes to the left sidebar of the front page {{{ $SIDEBAR_DATA = ' +<div class="content"> + <div class="block"> + <span class="corners-top"><span></span></span> + <div class="info"> + <h3>What is PHP?</h3> <p> <acronym title="recursive acronym for PHP: Hypertext Preprocessor">PHP</acronym> @@ -62,10 +69,11 @@ and the example archive sites and some of the other resources available in the <a href="/links.php">links section</a>. </p> -<p> - Ever wondered how popular PHP is? see the - <a href="/usage.php">Netcraft Survey</a>. -</p> +</div> +</div><!-- .block--> + + <div class="block"> + <div class="info"> <h3><a href="/thanks.php">Thanks To</a></h3> <ul class="simple"> @@ -83,27 +91,21 @@ <li><a href="http://www.rackspace.com/">Rackspace</a></li> <li><a href="http://www.eukhost.com/">EUKhost</a></li> </ul> -<h3>Related sites</h3> -<ul class="simple"> - <li><a href="http://www.apache.org/">Apache</a></li> - <li><a href="http://www.mysql.com/">MySQL</a></li> - <li><a href="http://www.postgresql.org/">PostgreSQL</a></li> - <li><a href="http://www.zend.com/">Zend Technologies</a></li> -</ul> -<h3>Community</h3> -<ul class="simple"> - <li><a href="http://www.linuxfund.org/">LinuxFund.org</a></li> - <li><a href="http://www.ostg.com/">OSTG</a></li> -</ul> <h3>Syndication</h3> <p> You can grab our news as an <a href="/feed.atom">Atom feed</a>. -</p>'; +</p> + </div><!--.block--> + <span class="corners-bottom"><span></span></span> + </div> + </div> +'; +// }}} $MIRROR_IMAGE = ''; -// Try to find a sponsor image in case this is an official mirror +// Try to find a sponsor image in case this is an official mirror {{{ if (is_official_mirror()) { // Iterate through possible mirror provider logo types in priority order @@ -141,62 +143,102 @@ break; } } -} - -/* {{{ Generate latest release info */ -/* NOTE: You are editing the wrong file, you should be in include/version.inc - * For RC: See the $PHP_x_RC variable - * For STABLE: See the $PHP_x_VERSION/_DATE/_MD5 variables - */ -$PHP_5_STABLE = $PHP_4_STABLE = array(); -$PHP_5_RC = $PHP_4_RC = ""; -$rel = $rc = ""; +} // }}} +// {{{ Generate latest release info list($PHP_5_STABLE, ) = each($RELEASES[5]); -list($PHP_4_STABLE, ) = each($RELEASES[4]); - -$rel = <<< EOT - <div id="releaseBox"> - <h4>Stable Releases</h4> - <ol id="releases"> - <li class="php5"><a href="/downloads.php#v5">Current PHP 5 Stable: <span class="release">$PHP_5_STABLE</span></a></li> - <li class="php5"><a href="/downloads.php#v4">Historical PHP 4 Stable: <span class="release">$PHP_4_STABLE</span></a></li> - </ol> - </div>\n -EOT; +$PHP_5_RC = null; /* Do we have any release candidates to brag about? */ if (count($RELEASES[5])>1) { list($PHP_5_RC, ) = each($RELEASES[5]); - - if (!empty($PHP_5_RC)) { - $rc .= " <li class=\"php5\"><a href=\"http://qa.php.net/\">Current PHP 5 RC: <span class=\"release\">$PHP_5_RC</span></a></li>\n"; - } } -if (count($RELEASES[4])>1) { - list($PHP_4_RC, ) = each($RELEASES[4]); - if (!empty($PHP_4_RC)) { - $rc .= " <li class=\"php4\"><a href=\"http://qa.php.net/\">Current PHP 4 RC: <span class=\"release\">$PHP_4_RC</span></a></li>\n"; - } -} -if (!empty($rc)) { - $rel .= <<< EOT - <div id="candidateBox"> - <h4><a href="http://qa.php.net/rc.php">Release Candidates</a></h4> - <ol id="candidates"> -$rc - </ol> - </div>\n -EOT; +$release_box = <<< RELEASE_DATA + <div class="content"> + <div class="block releases"><span class="corners-top"><span></span></span> + <div class="info"> + <h3>Stable releases</h3> + <p class="first">Current PHP 5 Stable: <a href="/ChangeLog-5.php#$PHP_5_STABLE"><strong>$PHP_5_STABLE</strong></a></p> + <p class="download-button"><a href="/downloads.php#v5"><span>Download</span></a></p> + <p class="top-border">Historical PHP Stable: <a href="/downloads.php#v4"><strong>4.4.9</strong></a></p> +RELEASE_DATA; + +if ($PHP_5_RC) { + $release_box .= <<< RELEASE_DATA + <h4>Release Candidates</h4> + <p class="top-border"><a href="http://qa.php.net/">$PHP_5_RC</a></p> +RELEASE_DATA; } +$release_box .= <<< RELEASE_DATA + <p><a href="/downloads.php"><strong>Download area »</strong></a></p> + </div><!-- .info --> + </div><!--.block--> +RELEASE_DATA; /* }}} */ +// Generate the event box {{{ +$upcoming_events = <<< UPCOMING_EVENTS + <div class="block"> + <div class="info"> + <h3 class="upcoming-events">Upcoming Events</h3> + <div class="calendar"><span class="corners-top"><span></span></span> + <h4>Events Calendar</h4> + <form method="get" action="/cal.php"> + <p> + <select class="month" name="cm"> +UPCOMING_EVENTS; + +$months = array(1 => "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"); +$current = date("m", $_SERVER["REQUEST_TIME"]); +foreach($months as $n => $month) { + $upcoming_events .= "<option value='$n' ". ($n == $current ? 'selected="selected"' : '') .">$month</option>\n"; +} + +$upcoming_events .= <<< UPCOMING_EVENTS + </select> + <span><input type="submit" class="button" value="View" /></span> + </p> + </form> + <span class="corners-bottom"><span></span></span></div> + <p class="add-event"><a href="/submit-event.php"><strong>Add event »</strong></a></p> + <div class="events"> + $EVENTS_DATA + </div> + </div><!-- .calendar --> + </div><!-- .info --> + </div><!-- .block --> +UPCOMING_EVENTS; +// }}} + // Prepend mirror image & latest releases to sidebar text -$RSIDEBAR_DATA = $MIRROR_IMAGE . $rel . $RSIDEBAR_DATA; +$RSIDEBAR_DATA = $MIRROR_IMAGE . $release_box . $upcoming_events; + +// Generate conference teaser {{{ +if (is_array($CONF_TEASER) && count($CONF_TEASER)) { + $categories = array("conference" => "Upcoming conferences", "cfp" => "Calling for papers"); + $teaser = ' <li id="news-line"><span class="corners-top"><span></span></span><ul>' . "\n"; + foreach($CONF_TEASER as $k => $a) { + if (is_array($a) && count($a)) { + $teaser .= " <li><span>" . $categories[$k] . "</span>\n"; + $teaser .= " <ul>"; + $count = 0; + $a = preg_replace("'([A-Za-z0-9])([\s\:\-\,]*?)call for(.*?)$'i", "$1", $a); + foreach($a as $url => $title) { + if ($count++ >= 4) { + break; + } + $teaser .= ' <li class="first last"><a href="' . $url. '">' . $title. '</a></li>' . "\n"; + } + $teaser .= " </ul>\n </li>\n"; + } // if set + } + $teaser .= ' </ul><span class="corners-bottom"><span></span></span></li><!-- #news-line -->'."\n"; + $PRE_DATA = $teaser; +} // }}} -// Write out common header +// Write out common header {{{ site_header("Hypertext Preprocessor", array( 'onload' => 'boldEvents();', @@ -218,38 +260,21 @@ ), ) ); +// }}} -if (is_array($CONF_TEASER) && count($CONF_TEASER)) { - $categories = array("conference" => "Upcoming conferences", "cfp" => "Calling for papers"); - echo ' <div id="confTeaser">' . "\n"; - echo " <table>\n"; - foreach($CONF_TEASER as $k => $a) { - if (is_array($a) && count($a)) { - echo " <tr>\n <td valign='top' style='white-space: nowrap'>".$categories[$k].":</td>\n"; - echo " <td valign='top'>\n"; - echo ' <ul class="' .$k. '">' . "\n"; - $count = 0; - $a = preg_replace("'([A-Za-z0-9])([\s\:\-\,]*?)call for(.*?)$'i", "$1", $a); - foreach($a as $url => $title) { - if ($count++ >= 4) { - break; - } - echo ' <li><a href="' . $url. '">' . $title. '</a></li>' . "\n"; - } - echo " </ul>\n </td>\n </tr>\n"; - } // if set - } - echo " </table>\n </div>\n\n<br />\n"; -} - - +?> + <li id="mid-column"> + <div class="content"> +<?php /* Where the h*ll did all the news go? - * See archives/2007.xml + * See ./bin/createNewsEntry */ print_news($NEWS_ENTRIES, "frontpage"); ?> + <p class="t-center"><a href="/archive/index.php"><strong>News Archive</strong></a></p> + </div> + </li><!-- #mid-column--> -<p class="center"><a href="/archive/index.php">News Archive</a></p> <?php site_footer( http://cvs.php.net/viewvc.cgi/phpweb/include/layout.inc?r1=1.287&r2=1.287.2.1&diff_format=u Index: phpweb/include/layout.inc diff -u phpweb/include/layout.inc:1.287 phpweb/include/layout.inc:1.287.2.1 --- phpweb/include/layout.inc:1.287 Wed Jun 18 04:59:21 2008 +++ phpweb/include/layout.inc Sun Aug 17 16:01:51 2008 @@ -1,5 +1,5 @@ <?php -/* $Id: layout.inc,v 1.287 2008/06/18 04:59:21 philip Exp $ */ +/* $Id: layout.inc,v 1.287.2.1 2008/08/17 16:01:51 bjori Exp $ */ // Set the static content root differently on php.net $_SERVER['STATIC_ROOT'] = ($MYSITE == 'http://www.php.net/') ? @@ -60,7 +60,7 @@ function site_header($title = '', $config = array()) { - global $EXPL_LANG, $SIDEBAR_DATA, $RSIDEBAR_DATA, $PAGE_COLUMNS, $PGI; + global $EXPL_LANG, $SIDEBAR_DATA, $PAGE_COLUMNS, $PGI, $PRE_DATA; // Default to empty array if improper parameter passed if (!is_array($config)) { $config = array(); } @@ -73,7 +73,6 @@ // sidebar and no left sidebar $PAGE_COLUMNS = 1; if (!empty($SIDEBAR_DATA)) { $PAGE_COLUMNS++; } - if (!empty($RSIDEBAR_DATA)) { $PAGE_COLUMNS++; } // Print out lang and charset headers if (!isset($config["lang"])) { $config["lang"] = "en"; } @@ -166,93 +165,83 @@ print <<<END_HEADER -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head{$profile}> - <title>PHP{$title}</title> - <style type="text/css" media="all"> - @import url("{$_SERVER['STATIC_ROOT']}/styles/site.css"); - @import url("{$_SERVER['STATIC_ROOT']}/styles/{$mirror_specific_style}.css"); - </style> - <!--[if IE]><![if gte IE 6]><![endif]--> - <style type="text/css" media="print"> - @import url("{$_SERVER['STATIC_ROOT']}/styles/print.css"); - </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} - <script type="text/javascript" src="{$_SERVER['STATIC_ROOT']}/userprefs.js"></script>{$base}{$meta}{$moreheadtags} + <title>PHP{$title}</title> + <meta http-equiv="Content-Type" content="text/html; charset={$config['charset']}" /> + <link type="text/css" media="screen" rel="stylesheet" href="{$_SERVER['STATIC_ROOT']}/styles/screen.css" /> + <link type="text/css" media="print" rel="stylesheet" href="{$_SERVER['STATIC_ROOT']}/styles/print.css" /> + <link type="text/css" media="handfield" rel="stylesheet" href="{$_SERVER['STATIC_ROOT']}/styles/handfield.css" /> + <!--[if IE ]> + <link type="text/css" rel="stylesheet" media="screen" href="{$_SERVER['STATIC_ROOT']}/styles/ie.css" /> + <![endif]--> + <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}> -<div id="headnav"> - <a href="/" rel="home"><img src="{$_SERVER['STATIC_ROOT']}/images/php.gif" - alt="PHP" width="120" height="67" /></a> - <div id="headmenu"> - <a href="/downloads.php">downloads</a> | - <a href="/docs.php">documentation</a> | - <a href="/FAQ.php">faq</a> | - <a href="/support.php">getting help</a> | - <a href="/mailing-lists.php">mailing lists</a> | - <a href="http://bugs.php.net/">reporting bugs</a> | - <a href="/sites.php">php.net sites</a> | - <a href="/links.php">links</a> | - <a href="/conferences/">conferences</a> | - <a href="/my.php">my php.net</a> - </div> -</div> - -<div id="headsearch"> - <form method="post" action="/search.php" id="topsearch"> - <p> - <span title="Keyboard shortcut: Alt+S (Win), Ctrl+S (Apple)"> - <span class="shortkey">s</span>earch for - </span> - <input type="text" name="pattern" value="" size="30" accesskey="s" /> - <span>in the</span> - <select name="show"> - <option value="quickref" selected="selected">function list</option> - <option value="all" >all php.net sites</option> - <option value="local" >this mirror only</option> - <option value="manual" >online documentation</option> - <option value="bugdb" >bug database</option> - <option value="news_archive">Site News Archive</option> - <option value="changelogs">All Changelogs</option> - <option value="pear" >just pear.php.net</option> - <option value="pecl" >just pecl.php.net</option> - <option value="talks" >just talks.php.net</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="{$_SERVER['STATIC_ROOT']}/images/small_submit_white.gif" - class="submit" alt="search" />{$lang_input} - </p> - </form> -</div> +<body id="homepage"> + <ul id="root"> + <li id="header"> + <div class="content"> + <h1><a href="/index.php">PHP: Hypertext Preprocessor</a></h1> + <form method="post" action="/search.php" id="topsearch"> + <div id="search-box"> + <label>Search for</label> + <span><input type="text" class="text" maxlength="20" name="pattern" /></span> + <label>in the</label> + <span> + <select name="show"> + <option value="quickref" selected="selected">function list</option> + <option value="all" >all php.net sites</option> + <option value="local" >this mirror only</option> + <option value="manual" >online documentation</option> + <option value="bugdb" >bug database</option> + <option value="news_archive">Site News Archive</option> + <option value="changelogs" >All Changelogs</option> + <option value="pear" >just pear.php.net</option> + <option value="pecl" >just pecl.php.net</option> + <option value="talks" >just talks.php.net</option> + <option value="maillist" >general mailing list</option> + <option value="devlist" >developer mailing list</option> + <option value="phpdoc" >documentation mailing list</option> + </select> + </span> + <span><input type="submit" class="button" value="Search" /></span> + </div> + </form> + </div> + </li><!--#header--> + <li id="main-menu"> + <ul id="top-navigation"> + <li class="first"><a href="/downloads.php">Downloads</a></li> + <li><a href="/docs.php">Documentation</a></li> + <li><a href="/FAQ.php">Faq</a></li> + <li><a href="/support.php">Getting Help</a></li> + <li><a href="/mailing-lists.php">Mailing Lists</a></li> + <li><a href="http://bugs.php.net">Reporting Bugs</a></li> + <li><a href="/sites.php">Php.net Sites</a></li> + <li><a href="/links.php">Links</a></li> + <li><a href="/conferences/">Conferences</a></li> + <li class="last"><a href="/my.php">My Php.net</a></li> + </ul> + </li><!--#main-menu--> -<div id="layout_{$PAGE_COLUMNS}">{$layout_helper} END_HEADER; + echo $PRE_DATA; + // Print out left column if ($PAGE_COLUMNS > 1) { - echo "\n <div id=\"leftbar\">\n$SIDEBAR_DATA\n </div>"; +echo ' + <li id="content"> + <ul id="content-columns"> + <li id="left-column"> + ' . $SIDEBAR_DATA . ' + </li>'; } - // Print out right column - if ($PAGE_COLUMNS > 2) { - echo "\n <div id=\"rightbar\">\n$RSIDEBAR_DATA\n </div>"; - } - - // Any layout workarounds? - if (!empty($config["layout_workaround"])) { - echo $config["layout_workaround"]; - } - - // Start main page content - echo "\n <div id=\"content\" class=\"$classname\"{$rtl}>\n"; } // Stats pages still need this @@ -260,17 +249,17 @@ function site_footer($config = array()) { - global $LAST_UPDATED, $PAGE_COLUMNS; + global $LAST_UPDATED, $PAGE_COLUMNS, $RSIDEBAR_DATA; - $stats = (have_stats() ? "\n <a href=\"/stats/\">stats</a> |" : ""); + $stats = (have_stats() ? "\n <li><a href=\"/stats/\">stats</a></li>" : ""); $rsslink = (isset($config["rss"]) ? - "<a href=\"{$config["rss"]}\">RSS</a> |" : + "<li><a href=\"{$config["rss"]}\">RSS</a></li>" : ""); $atomlink = (isset($config["atom"]) ? - "<a href=\"{$config["atom"]}\">Atom</a> |" : + "<li><a href=\"{$config["atom"]}\">Atom</a></li>" : ""); $viewsource = (isset($_SERVER['BASE_PAGE']) ? - "<a href=\"/source.php?url=/{$_SERVER['BASE_PAGE']}\">show source</a> |" : + "<li><a href=\"/source.php?url=/{$_SERVER['BASE_PAGE']}\">show source</a></li>" : ""); $provider_url = mirror_provider_url(); $provider_name = mirror_provider(); @@ -278,36 +267,40 @@ "<a href=\"/mirror.php\">This mirror</a> generously provided by:" : "<a href=\"/mirror.php\">This unofficial mirror</a> is operated at:"); $last_updated = strftime("%c %Z", $LAST_UPDATED); - $layout_helper = ($PAGE_COLUMNS > 2 ? "</div>" : ""); //$functionsjs = (in_array("functionsjs", $config) ? "\n<script src=\"" . $_SERVER['STATIC_ROOT'] . '/functions.js" type="text/javascript"></script>' : ''); + // Print out right column + if ($RSIDEBAR_DATA) { +echo ' + <li id="right-column"> + ' . $RSIDEBAR_DATA . ' + </li>'; + } + print <<<END_FOOTER - </div> - <div class="cleaner"> </div> -{$layout_helper}</div> - -<div id="footnav"> - $rsslink $atomlink $viewsource - <a href="/credits.php">credits</a> |$stats - <a href="/sitemap.php">sitemap</a> | - <a href="/contact.php">contact</a> | - <a href="/contact.php#ads">advertising</a> | - <a href="/mirrors.php">mirror sites</a> -</div> - -<div id="pagefooter"> - <div id="copyright"> - <a href="/copyright.php">Copyright © 2001-2008 The PHP Group</a><br /> - All rights reserved. - </div> - - <div id="thismirror"> - {$mirror_text} - <a href="{$provider_url}">{$provider_name}</a><br /> - Last updated: {$last_updated} - </div> -</div> + </ul> <!-- #content-columns --> + </li> <!-- #content --> + <li id="footer"><span class="corners-top"><span></span></span> + <div class="info"> + <div id="copyright"><a href="/copyright.php">Copyright © 2001-2008 The PHP Group</a><br />All rights reserved.</div> + <div id="footer-menu"> + <ul> + $rsslink $atomlink $viewsource + <li><a href="/credits.php">Credits</a></li> + $stats + <li><a href="/stats/">Stats</a></li> + <li><a href="/sitemap.php">Sitemap</a></li> + <li><a href="/contact.php">Contact</a></li> + <li><a href="/contact.php#ads">Advertising</a></li> + <li class="last"><a href="/mirrors.php">Mirror sites</a></li> + </ul><br /> + <small>{$mirror_text} <a href="{$provider_url}">{$provider_name}</a> Last updated: {$last_updated}</small> + </div> + </div> + <span class="corners-bottom"><span></span></span> + </li><!--#footer--> + </ul><!--#root--> </body> </html> @@ -699,16 +692,14 @@ $newsdate = date("d-M-Y", strtotime($published)); echo <<< EOT -<div class="newsItem hentry{$vevent}"> - <div class="newsImage">{$image}</div> - <h1 class="summary entry-title"><a name="{$id}" id="{$id}" href="{$permlink}" rel="bookmark" class="bookmark">{$item["title"]}</a></h1> - <div class="entry-content description"> - <abbr class="published newsdate" title="{$item["published"]}">[{$newsdate}]</abbr> - {$item["content"]} + <div class="block"><span class="corners-top"><span></span></span> + <div class="info hentry{$vevent}"> + <h3 class="summary entry-title"><a name="{$id}" id="{$id}" href="{$permlink}" rel="bookmark" class="bookmark">{$item["title"]}</a></h3> + <p class="news-date"><abbr class="published newsdate" title="{$item["published"]}">$newsdate</abbr></p> + <div class="newsImage">{$image}</div> + {$item["content"]} </div> -</div> - -<hr /> + </div><!--.block--> EOT; } http://cvs.php.net/viewvc.cgi/phpweb/include/shared-manual.inc?r1=1.240&r2=1.240.2.1&diff_format=u Index: phpweb/include/shared-manual.inc diff -u phpweb/include/shared-manual.inc:1.240 phpweb/include/shared-manual.inc:1.240.2.1 --- phpweb/include/shared-manual.inc:1.240 Thu Apr 10 18:41:13 2008 +++ phpweb/include/shared-manual.inc Sun Aug 17 16:01:51 2008 @@ -1,6 +1,6 @@ <?php // -*- C++ -*- -// $Id: shared-manual.inc,v 1.240 2008/04/10 18:41:13 philip Exp $ +// $Id: shared-manual.inc,v 1.240.2.1 2008/08/17 16:01:51 bjori Exp $ /* @@ -26,10 +26,10 @@ { global $PGI; $PGI = array_merge($PGI, $page_data); // merge for BC reasons - + // Set base page for this manual page $_SERVER['BASE_PAGE'] = 'manual/' . language_convert($PGI['head'][1]) . "/" . $PGI['this'][0]; - + // Set last modification time on the current manual page if (($time = @filemtime($_SERVER['DOCUMENT_ROOT'] ."/". $_SERVER['BASE_PAGE'])) != false) { $PGI['lastmod'] = gmdate("D, d M Y", $time); @@ -41,25 +41,24 @@ // Print out HTTP headers and the HTML header // for this manual page, according to details // already set up -// TODO: replace logo with logos/php-med-trans-light.gif on print function manual_header() { global $PGI, $LAST_UPDATED, $MYSITE; - + // Get values out of the config array $title = $PGI['this'][1]; list($encoding, $lang) = $PGI['head']; - + header("Last-Modified: " . gmdate("D, d M Y H:i:s ", $LAST_UPDATED) . "GMT"); //header("Cache-Control: public, max-age=600"); header("Vary: Cookie"); //header("Content-type: text/html;charset=$encoding"); header("Content-type: text/html;charset=utf-8"); header("Content-language: $lang"); - + // Set base href for this manual page $_SERVER['BASE_HREF'] = $MYSITE . $_SERVER['BASE_PAGE']; - + manual_sidebar(); site_header("$title - Manual", array( "link" => array( @@ -72,7 +71,22 @@ ), "profile" => "http://purl.org/NET/erdf/profile", )); + echo <<< MAIN_CONTENT + <li id="main-column"> + <div class="content"> +MAIN_CONTENT; + manual_navbar(); + +echo <<< MAIN_CONTENT + + <div class="block"><span class="corners-top"><span></span></span> + <div class="info"> + <p class="func-date">Last updated: <span>{$PGI['lastmod']}</span></p> + + +MAIN_CONTENT; + } // Print out manual page footer @@ -83,10 +97,18 @@ // Get vars for easy handling list($filename, $title) = $PGI['this']; - echo "<br /><br />"; + echo "</div><!-- .info -->\n"; + echo '<span class="corners-bottom"><span></span></span></div><!--.block-->'; + + manual_notes(); - echo "<br />"; + manual_navbar("bottom"); + echo <<< MAIN_CONTENT + </div> <!-- .content --> + </li><!-- #main-column--> +MAIN_CONTENT; + site_footer(); } @@ -100,7 +122,13 @@ global $PGI, $SIDEBAR_DATA; // Start sidebar with its <div> - $BAR = "<!--UdmComment-->\n<ul class=\"toc\">\n"; + $BAR = <<< SIDEBAR + <div class="content"> + <div class="block"><span class="corners-top"><span></span></span> + <div class="info"> + <h3>PHP Manual</h3> + <ul id="functions-list"> +SIDEBAR; // Link to manual home $BAR .= ' <li class="header home"><a href="' . $PGI['home'][0] . '">' . @@ -117,8 +145,8 @@ // Link to one page up if titles does not match if (($PGI['home'][1] !== $PGI['up'][1]) && $PGI['up'][1]) { - $BAR .= ' <li class="header up"><a href="' . $PGI['up'][0] . '">' . - $PGI['up'][1] . "</a></li>\n"; + $BAR .= ' <li class="header up sel"><a href="' . $PGI['up'][0] . '">' . + $PGI['up'][1] . "</a><ul>\n"; } // Print out one link for all siblings of this page @@ -128,7 +156,7 @@ list($url, $title) = $tocitem; // Get the proper classname to use for this <div> - $liclass = ($url == $PGI['this'][0]) ? ' class="active"' : ""; + $liclass = ($url == $PGI['this'][0]) ? ' class="sel"' : ""; // There are some very long function names, which // make the TOC too wide, so enable the browser to wrap them @@ -144,8 +172,19 @@ make_link($url, $title) . "</li>\n"; } + $close = ""; + if (($PGI['home'][1] !== $PGI['up'][1]) && $PGI['up'][1]) { + $close = "</ul></li>"; + } // Put navigation content into sidebar, end <div> - $SIDEBAR_DATA = "$BAR</ul><!--/UdmComment-->\n"; + $SIDEBAR_DATA = <<< SIDEBAR + $BAR + </ul> + </div> + <span class="corners-bottom"><span></span></span></div><!--.block--> + </div><!-- .content --> +SIDEBAR; + } function manual_navbar($location = "top") @@ -153,36 +192,27 @@ global $PGI, $LANG, $LANGUAGES, $INACTIVE_ONLINE_LANGUAGES, $ACTIVE_ONLINE_LANGUAGES; // Start navbar with - echo "<!--UdmComment-->\n<div class=\"manualnavbar manualnavbar_$location\">\n <span class=\"next\">\n"; + echo <<< NAVBAR + <div class="adv-block"><span class="corners-top"><span></span></span> +NAVBAR; + if (isset($PGI['next']) && isset($PGI['next'][1])) { - echo " <a href=\"{$PGI['next'][0]}\">" . - $PGI['next'][1] . - make_image('caret-r.gif', '>') . - "</a>\n"; + echo " <a href=\"{$PGI['next'][0]}\" class=\"next\">" . $PGI['next'][1] . "</a>\n"; } - echo " </span>\n <span class=\"prev\">\n"; if (isset($PGI['prev']) && isset($PGI['prev'][1])) { - echo " <a href=\"{$PGI['prev'][0]}\">" . - make_image('caret-l.gif', '<') . - $PGI['prev'][1] . "</a>\n"; + echo " <a href=\"{$PGI['prev'][0]}\" class=\"prev\">" . $PGI['prev'][1] . "</a>\n"; } else { echo " \n"; } - echo " </span>\n <hr />\n"; - - // Provide last updated information on this page - echo " <span class=\"lastupdated\">Last updated: {$PGI['lastmod']}</span>\n"; // Print out language switch on top of manual pages - echo " <div class=\"langchooser\">\n"; if ($location != 'bottom') { - $links = array(); // Quick access to filename $filename = $PGI['this'][0]; - - // Disable all languages without online content + + // Disable all languages without online content // Add a dropdown item for all languages left foreach ($ACTIVE_ONLINE_LANGUAGES as $code => $name) { if (!preg_match("!/$code/!", $_SERVER['BASE_PAGE']) @@ -194,22 +224,22 @@ $links[] = array('help-translate.php', 'Other'); // Print out the form with all the options - echo ' <form action="/manual/change.php" method="get">' . "\n" . - ' <p>view this page in </p><fieldset><select name="page">'. "\n"; + echo '<form action="/manual/change.php" method="get"><p>View this page in + + <select name="page">'; + foreach ($links as $link) { echo ' <option value="' . $link[0] . '">' . $link[1] . "</option>\n"; } - echo " </select>\n" . - ' <input type="image" src="' . $_SERVER['STATIC_ROOT'] . - '/images/small_submit.gif" id="changeLangImage" ' . - 'alt="" />' . "\n </fieldset></form>\n"; - + echo '</select><input type="submit" value="»" /></p></form>'; + } else { echo " \n"; } - echo " </div>\n"; - - echo "</div>\n<!--/UdmComment-->\n\n"; + echo <<< NAVBAR + <span class="corners-bottom"><span></span></span> + </div><!-- .adv-block--> +NAVBAR; } // ============================================================================= @@ -235,25 +265,25 @@ if(count($notes) > 2) { manual_navbar("bottom"); } +echo <<< MAIN_CONTENT + <div class="block"><span class="corners-top"><span></span></span> +MAIN_CONTENT; + // Link target to add a note to the current manual page, // and it's extended form with a [+] image $addnotelink = '/manual/add-note.php?sect=' . $filename . '&redirect=' . $_SERVER['BASE_HREF']; $addnotesnippet = - make_link($addnotelink, make_image('notes-add.gif', 'add a note', 'middle')) . - ' <small>' . - make_link($addnotelink, 'add a note') . - '</small>'; + '<div class="add-note">' . + make_link($addnotelink, 'Add Note') . + '</div>'; echo <<<END_USERNOTE_HEADER <div id="usernotes"> - <div class="head"> - <span class="action">{$addnotesnippet}</span> - <small>User Contributed Notes</small><br /> - <strong>{$title}</strong> - </div> + {$addnotesnippet} + <h4>User Contributed Notes</h4> END_USERNOTE_HEADER; // If we have no notes, then inform the user @@ -263,17 +293,19 @@ // If we have notes, print them out else { - + echo '<ul id="contributed-notes">'; foreach($notes as $note) { manual_note_display( $note['xwhen'], $note['user'], $note['note'], $note['id'] ); } - echo "\n <div class=\"foot\">$addnotesnippet</div>\n"; + echo "</ul>\n"; + echo $addnotesnippet; } // End of #usernotes echo "</div>"; + echo '<span class="corners-bottom"><span></span></span></div><!--.block-->'; } // Get user notes from the appropriate text dump @@ -311,7 +343,6 @@ if ($name) { $name = "\n <strong>" . htmlspecialchars($name) . "</strong><br />"; } $datestr = date("d-M-Y h:i", $date); $datestr = ($id ? "\n <a href=\"#$id\">$datestr</a>" : "\n $datestr"); - $anchor = ($id ? "<a name=\"$id\"></a>\n " : ""); $text = clean_note($text); // If the viewer is logged in, show admin options @@ -344,11 +375,16 @@ echo <<<USER_NOTE_TEXT - {$anchor}<div class="note">{$admin}{$name}{$datestr} - <div class="text"> + <li id="{$id}"> + <div class="username">{$name}<a name="#{$id}">{$datestr}</a></div> + <div class="ncontent"> + <div class="note"> + <span class="corners-top"><span></span></span> {$text} + <span class="corners-bottom"><span></span></span> + </div> </div> - </div> + </li> USER_NOTE_TEXT; } http://cvs.php.net/viewvc.cgi/phpweb/styles/print.css?r1=1.5&r2=1.5.2.1&diff_format=u Index: phpweb/styles/print.css diff -u phpweb/styles/print.css:1.5 phpweb/styles/print.css:1.5.2.1 --- phpweb/styles/print.css:1.5 Wed Sep 13 19:24:41 2006 +++ phpweb/styles/print.css Sun Aug 17 16:01:51 2008 @@ -1,22 +1,89 @@ -#headmenu, #headsearch, #leftbar, #rightbar, #footnav, #thismirror, -.manualnavbar .next, .manualnavbar .prev, .manualnavbar .langchooser, -.manualnavbar hr, .manualnavbar_bottom, #usernotes .action, #usernotes .foot { - display: none; -} - -#layout_2 #content, #layout_3 #content { - width: 100%; - margin: 0; -} +body { + margin:.2in .55in; + padding:0; + font:12pt "Times New Roman", serif; + } -#headnav, #layout_2, #layout_3, #layout_3_helper, div.manualnavbar { - background: none; +/* Hide and reset blocks + *******************************/ +#mid-column, +#main-column, +#right-column, +#header, +#content { + margin:0; + list-style:none; + } -#headnav { - float: right; +#left-column, +#footer, +.adv-block, +#main-menu, +#search-box, +#news-line, +.releases, +.calendar, +.add-event, +.add-note { + display:none; } -#usernotes .note, #usernotes { - border-top: 1px solid black; -} +/* Links decoration + *******************************/ +a { + color:black; + text-decoration:none; + } +a img { + border-width:0; + } + +/* Headings + *******************************/ +h1, h2, h3,h4 { + margin:1em 0 .5em; + font-family:Georgia,Serif; + font-weight:normal; + clear:both; + } + h1 { + margin-top:.5em; + font-size:180%; + } + h2 { + font-size:240%; + margin:.3em 0 0 0; + padding-bottom:0; + } + h3 { + font-size:150%; + margin-bottom:0; + } + + h4 { + font-size:120%; + margin-bottom:0; + } +p{ + margin:0 0 .6em 0; + } +blockquote{ + font-style:italic; + } +h3+blockquote, h2+blockquote, p+ul, h2+ul, h3+ul{ + margin-top:.2em; + } + +/* Etc + *******************************/ +.content a[href]:after, +.secondary a[href]:after, +#footer a[href]:after { + content: " (" attr(href) ") "; + font-size: 90%; + } +.content a[href^="/"]:after, +.secondary a[href^="/"]:after { + content: " (http://php.net/" attr(href) ") "; + } \ No newline at end of file http://cvs.php.net/viewvc.cgi/phpweb/styles/base.css?view=markup&rev=1.1 Index: phpweb/styles/base.css +++ phpweb/styles/base.css http://cvs.php.net/viewvc.cgi/phpweb/styles/content.css?view=markup&rev=1.1 Index: phpweb/styles/content.css +++ phpweb/styles/content.css http://cvs.php.net/viewvc.cgi/phpweb/styles/handfield.css?view=markup&rev=1.1 Index: phpweb/styles/handfield.css +++ phpweb/styles/handfield.css http://cvs.php.net/viewvc.cgi/phpweb/styles/helpers.css?view=markup&rev=1.1 Index: phpweb/styles/helpers.css +++ phpweb/styles/helpers.css http://cvs.php.net/viewvc.cgi/phpweb/styles/ie.css?view=markup&rev=1.1 Index: phpweb/styles/ie.css +++ phpweb/styles/ie.css http://cvs.php.net/viewvc.cgi/phpweb/styles/reset.css?view=markup&rev=1.1 Index: phpweb/styles/reset.css +++ phpweb/styles/reset.css http://cvs.php.net/viewvc.cgi/phpweb/styles/screen.css?view=markup&rev=1.1 Index: phpweb/styles/screen.css +++ phpweb/styles/screen.css