Commit: ff8a3a256ef31555c87ae19ec0b299e31947d22d Author: Hannes Magnusson <[email protected]> Wed, 20 Nov 2013 19:07:38 -0800 Parents: 7079d2176b3625be7f791d212eb5e57bd329e20b Branches: master
Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=ff8a3a256ef31555c87ae19ec0b299e31947d22d Log: Prettify the the right bar a little Split the conference panel into cfp and confs And add a link to te 5.5 migration guide Changed paths: M index.php M styles/home.css Diff: diff --git a/index.php b/index.php index e9451f1..69eded1 100644 --- a/index.php +++ b/index.php @@ -49,32 +49,6 @@ include_once 'include/pregen-confs.inc'; include_once 'include/pregen-news.inc'; include_once 'include/version.inc'; -// Prepare announcements. -if (is_array($CONF_TEASER) && $CONF_TEASER) { - $teaser_categories = array( - 'conference' => 'Upcoming conferences', - 'cfp' => 'Calling for papers', - ); - - $announcements = '<ul class="announcements">'; - - foreach ($CONF_TEASER as $category => $events) { - if (is_array($events) && $events) { - $announcements .= '<li><span class="category">'.$teaser_categories[$category].':</span><ul>'; - $links = array(); - foreach (array_slice($events, 0, 4) as $url => $title) { - $title = preg_replace("'([A-Za-z0-9])([\s\:\-\,]*?)call for(.*?)$'i", "$1", $title); - $announcements .= "<li><a href='$url'>$title</a></li>"; - } - $announcements .= '</ul>'; - } - } - - $announcements .= '</ul>'; -} else { - $announcements = ''; -} - require_once './Gateway/NewsFileSystemGateway.php'; @@ -168,10 +142,34 @@ site_header("Hypertext Preprocessor", ); // Print body of home page. -echo $content; +//echo $content; + +// Prepare announcements. +if (is_array($CONF_TEASER)) { + $conftype = array( + 'conference' => 'Upcoming conferences', + 'cfp' => 'Conferences Calling for papers', + ); + $announcements = ""; + foreach($CONF_TEASER as $category => $entries) { + if ($entries) { + $announcements .= '<div class="panel conferences">'; + $announcements .= '<span>' . $conftype[$category] .'</span><ul class="announcements">'; + foreach (array_slice($entries, 0, 4) as $url => $title) { + $title = preg_replace("'([A-Za-z0-9])([\s\:\-\,]*?)call for(.*?)$'i", "$1", $title); + $announcements .= "<li><a href='$url'>$title</a></li>"; + } + $announcements .= '</ul>'; + $announcements .= '</div>'; + } + } +} else { + $announcements = ''; +} $SIDEBAR = <<< SIDEBAR_DATA + <p class='panel'><a href='/migration55'>Upgrading to PHP5.5</a></p> $announcements <p class='panel'><a href='/tips.php'>Tips and Tricks</a></p> <p class='panel'><a href='/conferences/'>Conferences</a></p> diff --git a/styles/home.css b/styles/home.css index 013ae05..d47bb93 100644 --- a/styles/home.css +++ b/styles/home.css @@ -95,33 +95,46 @@ complimentary greens: 9FB553 7B8851 61761B C6DA82 CCDA99 /* {{{ Right-hand sidebar */ -.home aside.tips p.panel { +.home aside.tips .panel { margin:0.66666666666667em 0; -} - -.home aside.tips p.panel a { background:#f0f0f0; - color:#333; border:1px solid #e3e3e3; border-bottom-color:#d6d6d6; border-radius:2px; +} + +.home aside.tips .panel a { + color:#333; display: block; padding: .75em 1em; } -.home aside.tips p.panel a::after { +.home aside.tips .panel span { + display: block; + padding: .75em 1em; +} +.home aside.tips .conferences { + line-height: 1; +} +.home aside.tips .panel .announcements a { + padding: 0; + border: 0; + margin: 0; + line-height: 1; +} +.home aside.tips .panel a::after { float:right; content:"ยป"; color:#666; } -.home aside.tips p.panel a:hover, -.home aside.tips p.panel a:focus { +.home aside.tips .panel a:hover, +.home aside.tips .panel a:focus { background:#ebebf4; border-color:#dbdbeb; border-bottom-color:#cacae2; color:#000; } -.home aside.tips p.panel a:hover::after, -.home aside.tips p.panel a:focus::after { +.home aside.tips .panel a:hover::after, +.home aside.tips .panel a:focus::after { color:#333; } -- PHP Webmaster List Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
