cvs: phpweb /archive 2008.xml /conferences index.php /include layout.inc

bjori		Mon Feb 25 15:49:21 2008 UTC

  Modified files:              
    /phpweb/conferences	index.php 
    /phpweb/include	layout.inc 
    /phpweb/archive	2008.xml 
  Log:
  Initial hCalendar support for conferences
  
  
http://cvs.php.net/viewvc.cgi/phpweb/conferences/index.php?r1=1.22&r2=1.23&diff_format=u
Index: phpweb/conferences/index.php
diff -u phpweb/conferences/index.php:1.22 phpweb/conferences/index.php:1.23
--- phpweb/conferences/index.php:1.22	Sat Jan 12 11:13:28 2008
+++ phpweb/conferences/index.php	Mon Feb 25 15:49:21 2008
@@ -1,5 +1,5 @@
 <?php
-// $Id: index.php,v 1.22 2008/01/12 11:13:28 bjori Exp $
+// $Id: index.php,v 1.23 2008/02/25 15:49:21 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';
@@ -22,7 +22,7 @@
 
 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 . 'feed.atom" />'));
 
-print_news($NEWS_ENTRIES["conferences"]);
+print_news($NEWS_ENTRIES["conferences"], false, true);
 
 site_footer(
     array("atom" => "/feed.atom") // Add a link to the feed
http://cvs.php.net/viewvc.cgi/phpweb/include/layout.inc?r1=1.276&r2=1.277&diff_format=u
Index: phpweb/include/layout.inc
diff -u phpweb/include/layout.inc:1.276 phpweb/include/layout.inc:1.277
--- phpweb/include/layout.inc:1.276	Mon Feb 25 00:04:16 2008
+++ phpweb/include/layout.inc	Mon Feb 25 15:49:21 2008
@@ -1,5 +1,5 @@
 <?php
-/* $Id: layout.inc,v 1.276 2008/02/25 00:04:16 bjori Exp $ */
+/* $Id: layout.inc,v 1.277 2008/02/25 15:49:21 bjori Exp $ */
 
 // Set the static content root differently on php.net
 $_SERVER['STATIC_ROOT'] = ($MYSITE == 'http://www.php.net/') ?
@@ -623,7 +623,7 @@
 }
 
 // Print news
-function print_news($news, $year = false) {
+function print_news($news, $year = false, $event = false) {
     foreach($news as $item) {
         if ($year && $year != date("Y", strtotime($item["date"]))) {
             continue;
@@ -632,10 +632,14 @@
         if($item["image"]) {
             $image = news_image($item["image"]["link"], $item["image"]["image"], $item["image"]["title"]);
         }
+        $vevent = "";
+        if ($event) {
+            $vevent = " vevent";
+        }
         echo <<< EOT
-<div class="newsItem">
+<div class="newsItem$vevent">
     $image
-    <a name="{$item["fragment"]}" id="{$item["fragment"]}"><h1>{$item["title"]}</h1></a>
+    <a name="{$item["fragment"]}" id="{$item["fragment"]}"><h1 class="summary">{$item["title"]}</h1></a>
     {$item["content"]}
 </div>
 
http://cvs.php.net/viewvc.cgi/phpweb/archive/2008.xml?r1=1.9&r2=1.10&diff_format=u
Index: phpweb/archive/2008.xml
diff -u phpweb/archive/2008.xml:1.9 phpweb/archive/2008.xml:1.10
--- phpweb/archive/2008.xml:1.9	Mon Feb 25 12:15:14 2008
+++ phpweb/archive/2008.xml	Mon Feb 25 15:49:21 2008
@@ -21,8 +21,8 @@
     <php:finalTeaserDate>2008-05-24</php:finalTeaserDate>
     <php:newsImage link="http://tek.phparch.com/" title="php|tek 2008: Chicago">phptek_2008.png</php:newsImage>
     <content type="xhtml">
-      <div xmlns="http://www.w3.org/1999/xhtml">
-<a href="http://tek.phparch.com/">php|tek 2008: Chicago</a>
+      <div xmlns="http://www.w3.org/1999/xhtml" class="description">
+<a href="http://tek.phparch.com/" class="url">php|tek 2008: Chicago</a>
 <p>
 The publishers of <a href="http://www.phparch.com/">php|architect Magazine</a> are proud to announce the php|tek 2008 conference in Chicago, Illinois, USA.
 </p>
@@ -46,13 +46,14 @@
     <php:finalTeaserDate>2008-03-16</php:finalTeaserDate>
     <php:newsImage link="http://conf.phpquebec.com/en/conf2008/" title="PHP Québec conference 2008">conference_php_quebec.gif</php:newsImage>
     <content type="xhtml">
-      <div xmlns="http://www.w3.org/1999/xhtml">
+      <div xmlns="http://www.w3.org/1999/xhtml" class="description">
 <a href="http://conf.phpquebec.com/">2008 PHP Quebec Conference &amp; Job Fair</a>
 <p>
 The PHP Quebec team is pleased to present the sixth edition of the <a 
-href="http://conf.phpquebec.com">PHP 
+href="http://conf.phpquebec.com" class="url">PHP 
 Quebec Conference</a>. The Conference will take place in Montreal, Canada, 
-on March 12 through 14.
+on <abbr class="dtstart" title="2008-03-12">March 12</abbr> through
+<abbr class="dtend" title="2008-03-15">14</abbr>.
 </p>
 <p>
 Join us for the PHPLabs, 2 days of technical talks, the Open Source Job 
@@ -77,9 +78,9 @@
     <php:newsImage xmlns="http://php.net/ns/news" link="http://www.phpconference.co.uk/" title="PHP London Conference 08">phplondon2008.png</php:newsImage>
     <link href="http://www.phpconference.co.uk/" rel="via" type="text/html"/>
     <content type="xhtml">
-      <div xmlns="http://www.w3.org/1999/xhtml">
-        <p>February 29th (Leap Year Day). phplondon.org  announce their third
-            annual <a href="http://www.phpconference.co.uk" alt="phplondon.org community conference">community conference</a>
+      <div xmlns="http://www.w3.org/1999/xhtml" class="description">
+		  <p><abbr class="dtstart" title="2008-02-29">February 29th</abbr> (Leap Year Day). phplondon.org  announce their third
+            annual <a href="http://www.phpconference.co.uk" alt="phplondon.org community conference" class="url">community conference</a>
             to be held at Inmarsat, Old Street, London.</p>
         <p>This year the conference will run two tracks and include speakers such as Derick Rethans, Wez Furlong, Scott MacVicar and Zoe Slattery.</p>
         <p>We will also be holding an extended presentation and discussion on frameworks for PHP.</p>