cvs: phpweb / index.php /conferences index.php /include layout.inc

bjori Sat Dec 29 15:43:43 2007 UTC Modified files: /phpweb index.php /phpweb/conferences index.php /phpweb/include layout.inc Log: Promote the Atom feed http://cvs.php.net/viewvc.cgi/phpweb/index.php?r1=1.902&r2=1.903&diff_format=u Index: phpweb/index.php diff -u phpweb/index.php:1.902 phpweb/index.php:1.903 --- phpweb/index.php:1.902 Fri Oct 19 10:30:08 2007 +++ phpweb/index.php Sat Dec 29 15:43:42 2007 @@ -97,8 +97,7 @@ <h3>Syndication</h3> <p> - You can grab our news as an RSS feed via a daily dump in a file - named <a href="/news.rss">news.rss</a>. + You can grab our news as an <a href="/feed.atom">Atom feed</a>. </p>'; $MIRROR_IMAGE = ''; @@ -200,7 +199,7 @@ site_header("Hypertext Preprocessor", array( 'onload' => 'boldEvents();', - 'headtags' => '<link rel="alternate" type="application/rss+xml" title="PHP: Hypertext Preprocessor" href="' . $MYSITE . 'news.rss" />', + 'headtags' => '<link rel="alternate" type="application/atom+xml" title="PHP: Hypertext Preprocessor" href="' . $MYSITE . 'feed.atom" />', 'link' => array( array( "rel" => "search", @@ -249,6 +248,6 @@ <?php site_footer( - array("rss" => "/news.rss") // Add a link to the feed at the bottom + array("atom" => "/feed.atom") // Add a link to the feed at the bottom ); http://cvs.php.net/viewvc.cgi/phpweb/conferences/index.php?r1=1.20&r2=1.21&diff_format=u Index: phpweb/conferences/index.php diff -u phpweb/conferences/index.php:1.20 phpweb/conferences/index.php:1.21 --- phpweb/conferences/index.php:1.20 Thu Jun 7 14:22:11 2007 +++ phpweb/conferences/index.php Sat Dec 29 15:43:42 2007 @@ -1,5 +1,5 @@ <?php -// $Id: index.php,v 1.20 2007/06/07 14:22:11 bjori Exp $ +// $Id: index.php,v 1.21 2007/12/29 15:43:42 bjori Exp $ $_SERVER['BASE_PAGE'] = 'conferences/index.php'; include_once $_SERVER['DOCUMENT_ROOT'] . '/include/prepend.inc'; include_once $_SERVER['DOCUMENT_ROOT'] . '/include/pregen-events.inc'; @@ -20,11 +20,11 @@ unset($RSIDEBAR_DATA); -site_header("PHP Conferences around the world", array("layout_workaround" => $layout_workaround, 'headtags' => '<link rel="alternate" type="application/rss+xml" title="PHP: Conference announcements" href="' . $MYSITE . 'conferences/news.rss" />')); +site_header("PHP Conferences around the world", array("layout_workaround" => $layout_workaround, 'headtags' => '<link rel="alternate" type="application/atom+xml" title="PHP: Conference announcements" href="' . $MYSITE . 'conferences/feed.atom" />')); print_news($NEWS_ENTRIES["conferences"]); site_footer( - array("rss" => "/conferences/news.rss") // Add a link to the feed + array("atom" => "/feed.atom") // Add a link to the feed ); http://cvs.php.net/viewvc.cgi/phpweb/include/layout.inc?r1=1.271&r2=1.272&diff_format=u Index: phpweb/include/layout.inc diff -u phpweb/include/layout.inc:1.271 phpweb/include/layout.inc:1.272 --- phpweb/include/layout.inc:1.271 Sat Dec 29 14:45:09 2007 +++ phpweb/include/layout.inc Sat Dec 29 15:43:42 2007 @@ -1,5 +1,5 @@ <?php -/* $Id: layout.inc,v 1.271 2007/12/29 14:45:09 bjori Exp $ */ +/* $Id: layout.inc,v 1.272 2007/12/29 15:43:42 bjori Exp $ */ // Set the static content root differently on php.net $_SERVER['STATIC_ROOT'] = ($MYSITE == 'http://www.php.net/') ? @@ -243,6 +243,9 @@ $rsslink = (isset($config["rss"]) ? "<a href=\"{$config["rss"]}\">RSS</a> |" : ""); + $atomlink = (isset($config["atom"]) ? + "<a href=\"{$config["atom"]}\">Atom</a> |" : + ""); $viewsource = (isset($_SERVER['BASE_PAGE']) ? "<a href=\"/source.php?url=/{$_SERVER['BASE_PAGE']}\">show source</a> |" : ""); @@ -262,7 +265,7 @@ {$layout_helper}</div> <div id="footnav"> - $rsslink $viewsource + $rsslink $atomlink $viewsource <a href="/credits.php">credits</a> |$stats <a href="/sitemap.php">sitemap</a> | <a href="/contact.php">contact</a> | @@ -593,7 +596,7 @@ <p> For the latest news, <a href="/index.php">check the homepage</a>, - or <a href="/news.rss">our RSS feed</a>. + or <a href="/feed.atom">our Atom feed</a>. </p> <h3>Archives by year</h3>