com web/php: Fix/enable archive sidebar: archive/2000.php archive/2001.php archive/2002.php archive/2003.php archive/2004.php archive/2005.php
archive/2006.php archive/2007.php archive/2008.php archive/2009.php archive/2010.php archive/2011.php archive/2012.php archive/2013.php
include/layout.inc

Commit: c63bbd008a18808b752d28faf4e484487d0ef7aa Author: Hannes Magnusson <bjori@mongodb.com> Tue, 3 Dec 2013 18:12:55 -0800 Parents: 9b4e20417fc5e41202658cfdc2be578e334a513e Branches: master Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=c63bbd008a18808b752d28faf4e484487d0ef7aa Log: Fix/enable archive sidebar Changed paths: M archive/2000.php M archive/2001.php M archive/2002.php M archive/2003.php M archive/2004.php M archive/2005.php M archive/2006.php M archive/2007.php M archive/2008.php M archive/2009.php M archive/2010.php M archive/2011.php M archive/2012.php M archive/2013.php M include/layout.inc Diff: diff --git a/archive/2000.php b/archive/2000.php index e3b29dc..89a4681 100644 --- a/archive/2000.php +++ b/archive/2000.php @@ -166,4 +166,5 @@ site_header("News Archive - 2000", array("generate_modified" => true)); ChangeLog provides a complete list of changes. </p> -<?php site_footer(); ?> +<?php site_footer(array('elephpants' => true, 'sidebar' => $SIDEBAR_DATA)); + diff --git a/archive/2001.php b/archive/2001.php index d839a08..6b82bde 100644 --- a/archive/2001..php +++ b/archive/2001.php @@ -315,4 +315,4 @@ site_header("News Archive - 2001", array("generate_modified" => true)); were discovered in PHP 4.0.4. </p> -<?php site_footer(); ?> +<?php site_footer(array('elephpants' => true, 'sidebar' => $SIDEBAR_DATA)); diff --git a/archive/2002.php b/archive/2002.php index 7790bb2..1bdb1b2 100644 --- a/archive/2002.php +++ b/archive/2002.php @@ -602,4 +602,4 @@ site_header("News Archive - 2002", array("generate_modified" => true)); <li><a href="http://www.phpconference.de/2001/images/PHP_Konferenz/">Conference photos</a></li> </ul> -<?php site_footer(); ?> +<?php site_footer(array('elephpants' => true, 'sidebar' => $SIDEBAR_DATA)); diff --git a/archive/2003.php b/archive/2003.php index c5796c5..079d161 100644 --- a/archive/2003.php +++ b/archive/2003.php @@ -796,4 +796,4 @@ site_header("News Archive - 2003", array("generate_modified" => true)); of beta-quality. </p> -<?php site_footer(); ?> +<?php site_footer(array('elephpants' => true, 'sidebar' => $SIDEBAR_DATA)); diff --git a/archive/2004.php b/archive/2004.php index b267474..7bad694 100644 --- a/archive/2004.php +++ b/archive/2004.php @@ -655,4 +655,4 @@ site_header("News Archive - 2004", array("generate_modified" => true)); one of a kind conference! </p> -<?php site_footer(); ?> +<?php site_footer(array('elephpants' => true, 'sidebar' => $SIDEBAR_DATA)); diff --git a/archive/2005.php b/archive/2005.php index 30d7d43..d582c61 100644 --- a/archive/2005.php +++ b/archive/2005.php @@ -537,4 +537,4 @@ For changes in PHP 4.4.0 since PHP 4.3.11, please consult the Congratulations to us all! </p> -<?php site_footer(); ?> +<?php site_footer(array('elephpants' => true, 'sidebar' => $SIDEBAR_DATA)); diff --git a/archive/2006.php b/archive/2006.php index 1462027..505db79 100644 --- a/archive/2006.php +++ b/archive/2006.php @@ -467,4 +467,4 @@ Further details about this release can be found in the <a href="/release_5_1_2.p and the full list of changes is available in the <a href="/ChangeLog-5.php#5.1.2">PHP 5 ChangeLog</a>. </p> -<?php site_footer(); ?> +<?php site_footer(array('elephpants' => true, 'sidebar' => $SIDEBAR_DATA)); diff --git a/archive/2007.php b/archive/2007.php index 2604bb0..f9ed0d1 100644 --- a/archive/2007.php +++ b/archive/2007.php @@ -674,6 +674,5 @@ This year, the conference once again promises to be an excellent event for PHP d </p> </div> </div> -<?php -site_footer(); +<?php site_footer(array('elephpants' => true, 'sidebar' => $SIDEBAR_DATA)); diff --git a/archive/2008.php b/archive/2008.php index 87bc6f7..0095086 100644 --- a/archive/2008.php +++ b/archive/2008.php @@ -952,7 +952,4 @@ releases to address security issues could be made until 2008-08-08. </div> </div> -<?php - -site_footer(); - +<?php site_footer(array('elephpants' => true, 'sidebar' => $SIDEBAR_DATA)); diff --git a/archive/2009.php b/archive/2009.php index c2a593f..07f7b3c 100644 --- a/archive/2009.php +++ b/archive/2009.php @@ -964,8 +964,7 @@ site_header("News Archive - 2009"); </div> </div> -<?php -/* %s/<a href="\(.*\)"><img src="\/images\/news\/\(.*\)" alt="\(.*\)" width.*><\/a>/<?php news_image("\1", "\2", "\3"); ?>/g */ -site_footer(); + +<?php site_footer(array('elephpants' => true, 'sidebar' => $SIDEBAR_DATA)); diff --git a/archive/2010.php b/archive/2010.php index 832468c..c0264b5 100644 --- a/archive/2010.php +++ b/archive/2010.php @@ -765,7 +765,5 @@ class Bar {<br/> </div> </div> -<?php - -site_footer(); +<?php site_footer(array('elephpants' => true, 'sidebar' => $SIDEBAR_DATA)); diff --git a/archive/2011.php b/archive/2011.php index 90b4870..42d6497 100644 --- a/archive/2011.php +++ b/archive/2011.php @@ -1015,8 +1015,4 @@ site_header("News Archive - 2011"); </div> </div> -<?php - -/* %s/<a href="\(.*\)"><img src="\/images\/news\/\(.*\)" alt="\(.*\)" width.*><\/a>/<?php news_image("\1", "\2", "\3"); ?>/g */ -site_footer(); - +<?php site_footer(array('elephpants' => true, 'sidebar' => $SIDEBAR_DATA)); diff --git a/archive/2012.php b/archive/2012.php index 7b13005..7e935ce 100644 --- a/archive/2012.php +++ b/archive/2012.php @@ -1067,7 +1067,4 @@ site_header("News Archive - 2012"); </div> </div> -<?php - -site_footer(); - +<?php site_footer(array('elephpants' => true, 'sidebar' => $SIDEBAR_DATA)); diff --git a/archive/2013.php b/archive/2013.php index faf855a..ddf1fc5 100644 --- a/archive/2013.php +++ b/archive/2013.php @@ -19,5 +19,6 @@ site_header("News Archive - 2013"); print_news($NEWS_ENTRIES, array("conferences", "cfp", "frontpage"), 50, 2013); -site_footer(); +/* %s/<a href="\(.*\)"><img src="\/images\/news\/\(.*\)" alt="\(.*\)" width.*><\/a>/<?php news_image("\1", "\2", "\3"); ?>/g */ +site_footer(array('elephpants' => true, 'sidebar' => $SIDEBAR_DATA)); diff --git a/include/layout.inc b/include/layout.inc index c12adad..53dd165 100644 --- a/include/layout.inc +++ b/include/layout.inc @@ -420,23 +420,14 @@ function news_archive_sidebar() { global $SIDEBAR_DATA; $SIDEBAR_DATA = ' -<h3>Latest news</h3> +<h3 class="announcements">Archives by year</h3> -<p> - For the latest news, <a href="/index.php" rel="home">check the homepage</a>, - or <a href="/feed.atom">our Atom feed</a>. -</p> - -<h3>Archives by year</h3> - -<ul class="toc"> '; for ($i = date("Y"); $i >= 1998; $i--) { $pagename = "archive/$i..php"; - $classname = ($pagename == $_SERVER['BASE_PAGE'] ? ' class="active"' : ''); - $SIDEBAR_DATA .= "<li{$classname}><a href=\"/{$pagename}\">{$i}</a></li>\n"; + $classname = ($pagename == $_SERVER['BASE_PAGE'] ? " active" : ''); + $SIDEBAR_DATA .= "<p class='panel{$classname}'><a href=\"/{$pagename}\">{$i}</a></p>\n"; } - $SIDEBAR_DATA .= '</ul>'; } // Print news