[guadec2010-web] Post-GUADEC update

From: Sense Hofstede <sehofstede src gnome org>
To: commits-list gnome org
Cc:
Subject: [guadec2010-web] Post-GUADEC update
Date: Tue, 3 Aug 2010 08:43:50 +0000 (UTC)
commit e743c064bc109fe6a657aeaf589c8697504dba44
Author: Sense Hofstede <sense ubuntu com>
Date:   Tue Aug 3 10:42:54 2010 +0200

    Post-GUADEC update
    
    Last commit after GUADEC 2010, with all the changes made during the conference.

 css/index.css                                      |   60 ++++++-
 img/COPYING                                        |   14 +-
 img/brochure-smallpic.png                          |  Bin 0 -> 12662 bytes
 img/flumotion_banner.png                           |  Bin 0 -> 32665 bytes
 img/guadec/IMG_8878m.JPG                           |  Bin 0 -> 97195 bytes
 img/guadec/IMG_8885m.JPG                           |  Bin 0 -> 98089 bytes
 img/livestream/identi.png                          |  Bin 0 -> 672 bytes
 img/livestreamscreen/flickr.png                    |  Bin 0 -> 1265 bytes
 img/livestreamscreen/identi.png                    |  Bin 0 -> 1543 bytes
 img/livestreamscreen/picasa.png                    |  Bin 0 -> 1620 bytes
 img/livestreamscreen/twitter.png                   |  Bin 0 -> 1120 bytes
 img/livestreamscreen/youtube.png                   |  Bin 0 -> 1621 bytes
 img/local/IMG_7889ms.jpg                           |  Bin 0 -> 82129 bytes
 img/local/Tram_map_the_hague.PNG                   |  Bin 0 -> 357567 bytes
 img/local/Tram_map_the_hague_1999s.PNG             |  Bin 0 -> 9624 bytes
 img/neary_consulting.png                           |  Bin 3321 -> 3288 bytes
 img/silhouette-color.png                           |  Bin 0 -> 4821 bytes
 img/spnsrs-overview/fluendo.png                    |  Bin 0 -> 6469 bytes
 img/spnsrs-overview/flumotion.png                  |  Bin 0 -> 2177 bytes
 img/spnsrs-overview/hxx.png                        |  Bin 0 -> 2660 bytes
 img/spnsrs-overview/meego.png                      |  Bin 6230 -> 6239 bytes
 img/spnsrs/denhaag.png                             |  Bin 0 -> 11865 bytes
 img/spnsrs/fluendo.png                             |  Bin 0 -> 6847 bytes
 img/spnsrs/flumotion.png                           |  Bin 0 -> 2226 bytes
 img/spnsrs/hxx.png                                 |  Bin 0 -> 2530 bytes
 img/spnsrs/meego.png                               |  Bin 7438 -> 7514 bytes
 img/tgood-speakers/stevegeorge2010m.jpg            |  Bin 0 -> 24005 bytes
 pages/conference/ConferenceHandler.inc.php         |   37 ++++
 .../LivestreamscreenHandler.inc.php                |   37 ++++
 pages/livestreamscreen/index.php                   |   23 +++
 pages/streams/StreamsHandler.inc.php               |   93 ++++++++++
 pages/streams/index.php                            |   23 +++
 styles/livestream.css                              |    2 +-
 styles/livestreamscreen.css                        |   65 +++++++
 styles/sponsors.css                                |    5 +
 styles/streams.css                                 |   55 ++++++
 templates/common/footer.small.tpl                  |  111 +++++++++++
 templates/common/footer.tpl                        |    3 +
 templates/common/header.small.tpl                  |   44 +++++
 templates/conference/index.tpl                     |  110 +++++++++---
 templates/livestreamscreen/index.tpl               |   26 +++
 templates/schedConf/index.tpl                      |    6 +-
 templates/schedConf/opendesktopday.tpl             |    4 +-
 templates/schedConf/sponsors.tpl                   |  194 ++++++++++++++++----
 templates/streams/index.tpl                        |   38 ++++
 templates/streams/stream.tpl                       |   35 ++++
 46 files changed, 917 insertions(+), 68 deletions(-)
---
diff --git a/css/index.css b/css/index.css
index 2314cb4..8670ee8 100644
--- a/css/index.css
+++ b/css/index.css
@@ -17,7 +17,7 @@
     padding-left: 2px;
     margin-left: auto;
     margin-right: auto;
-    width: 233px;
+    /*width: 233px;*/
     /*margin-bottom: 40px;*/
 }
 .flickrPhotos a {
@@ -45,3 +45,61 @@
     line-height: 170%;
     font-size: 16px;
 }
+/* Extra-attention menu bar
+ ******************************************************************************/
+#attention-nav ul {
+    position: absolute;
+    top: -60px;
+    font-size: 14pt;
+    font-weight: bold;
+}
+#attention-nav ul li {
+    display: inline;
+    list-style: none;
+}
+#attention-nav ul li:first-child {
+    margin-left: 0;
+}
+/* Stream display on front page
+ ******************************************************************************/
+#streamview,
+#frontstream {
+    width: 560px;
+    margin: 0 auto;
+}
+#streamlist ul li {
+    display: inline;
+    color: #000;
+    font-weight: bold;
+    text-align: center;
+    font-size: 11pt;
+    margin-left: 1em;
+}
+#streamlist ul li a {
+    color: #000;
+    text-decoration: none;
+}
+#streamlist ul li a:hover {
+    text-decoration: underline;
+}
+#streamlist ul li:first-child {
+    margin-left: 0;
+}
+
+.videoplayer {
+    background: #000;
+    margin: 0;
+    padding: 0 0 0 0;
+}
+
+/* The Hague logo
+ ******************************************************************************/
+#footer {
+    position: relative;
+}
+#thehaguelogo {
+    position: absolute;
+    /*top: -180px;*/
+    right: 40px;
+    bottom: 40px;
+}
diff --git a/img/COPYING b/img/COPYING
index 0f10a72..c14017a 100644
--- a/img/COPYING
+++ b/img/COPYING
@@ -1,5 +1,11 @@
+'arjen-kamphuis.jpg' is from an unknown source (BUG)
 'guadec-oranje.png' was created by Ð?Ð°Ð½Ð¸Ð»Ð¾ Ð¨ÐµÐ³Ð°Ð½ <http://danilo.segan.org/>
-
-
-The logos in the folders 'spnsrs', 'spnsrs-overview' and 'tgood-spnsrs' are owned by the respective companies whose logos they are. The copyright lies with them, reproduction and modification without their consent is not allowed.
-An exception is 'tgood-spnsrs/noiv.png', which is property of the NOiV and falls under the Creative Commons Attribution-Share Alike 3.0 Netherlands license <http://creativecommons.org/licenses/by-sa/3.0/nl/deed.en_US>
+'logo_noiv_def.jpg' is property of the NOiV and falls under the Creative Commons Attribution-Share Alike 3.0 Netherlands license <http://creativecommons.org/licenses/by-sa/3.0/nl/deed.en_US>
+'neary_consulting.png' is the logo of Neary Consulting <http://www.neary-consulting.com/> and owned by them.
+'
+jose_felix_ontanon.jpg
+daniel_armendariz.jpg
+stormy_peters.jpg
+juan_conde.jpg
+stephan_wildeboer.png
+arjen_kamphuis.jpg' provided by speakers.
diff --git a/img/brochure-smallpic.png b/img/brochure-smallpic.png
new file mode 100644
index 0000000..47fdbb3
Binary files /dev/null and b/img/brochure-smallpic.png differ
diff --git a/img/flumotion_banner.png b/img/flumotion_banner.png
new file mode 100644
index 0000000..bc6d7a6
Binary files /dev/null and b/img/flumotion_banner.png differ
diff --git a/img/guadec/IMG_8878m.JPG b/img/guadec/IMG_8878m.JPG
new file mode 100644
index 0000000..cae61a1
Binary files /dev/null and b/img/guadec/IMG_8878m.JPG differ
diff --git a/img/guadec/IMG_8885m.JPG b/img/guadec/IMG_8885m.JPG
new file mode 100644
index 0000000..f7599d3
Binary files /dev/null and b/img/guadec/IMG_8885m.JPG differ
diff --git a/img/livestream/identi.png b/img/livestream/identi.png
new file mode 100644
index 0000000..df91b2b
Binary files /dev/null and b/img/livestream/identi.png differ
diff --git a/img/livestreamscreen/flickr.png b/img/livestreamscreen/flickr.png
new file mode 100644
index 0000000..8bf09c9
Binary files /dev/null and b/img/livestreamscreen/flickr.png differ
diff --git a/img/livestreamscreen/identi.png b/img/livestreamscreen/identi.png
new file mode 100644
index 0000000..39762e0
Binary files /dev/null and b/img/livestreamscreen/identi.png differ
diff --git a/img/livestreamscreen/picasa.png b/img/livestreamscreen/picasa.png
new file mode 100644
index 0000000..358a309
Binary files /dev/null and b/img/livestreamscreen/picasa.png differ
diff --git a/img/livestreamscreen/twitter.png b/img/livestreamscreen/twitter.png
new file mode 100644
index 0000000..d94419a
Binary files /dev/null and b/img/livestreamscreen/twitter.png differ
diff --git a/img/livestreamscreen/youtube.png b/img/livestreamscreen/youtube.png
new file mode 100644
index 0000000..28b28f3
Binary files /dev/null and b/img/livestreamscreen/youtube.png differ
diff --git a/img/local/IMG_7889ms.jpg b/img/local/IMG_7889ms.jpg
new file mode 100644
index 0000000..19a1810
Binary files /dev/null and b/img/local/IMG_7889ms.jpg differ
diff --git a/img/local/Tram_map_the_hague.PNG b/img/local/Tram_map_the_hague.PNG
new file mode 100644
index 0000000..5e7f06b
Binary files /dev/null and b/img/local/Tram_map_the_hague.PNG differ
diff --git a/img/local/Tram_map_the_hague_1999s.PNG b/img/local/Tram_map_the_hague_1999s.PNG
new file mode 100644
index 0000000..c6a7f5e
Binary files /dev/null and b/img/local/Tram_map_the_hague_1999s.PNG differ
diff --git a/img/neary_consulting.png b/img/neary_consulting.png
index 8731a44..b1fd942 100644
Binary files a/img/neary_consulting.png and b/img/neary_consulting.png differ
diff --git a/img/silhouette-color.png b/img/silhouette-color.png
new file mode 100644
index 0000000..cee4bf4
Binary files /dev/null and b/img/silhouette-color.png differ
diff --git a/img/spnsrs-overview/fluendo.png b/img/spnsrs-overview/fluendo.png
new file mode 100644
index 0000000..c251200
Binary files /dev/null and b/img/spnsrs-overview/fluendo.png differ
diff --git a/img/spnsrs-overview/flumotion.png b/img/spnsrs-overview/flumotion.png
new file mode 100644
index 0000000..316a4ee
Binary files /dev/null and b/img/spnsrs-overview/flumotion.png differ
diff --git a/img/spnsrs-overview/hxx.png b/img/spnsrs-overview/hxx.png
new file mode 100644
index 0000000..0cb1659
Binary files /dev/null and b/img/spnsrs-overview/hxx.png differ
diff --git a/img/spnsrs-overview/meego.png b/img/spnsrs-overview/meego.png
index f77b48c..fc50f55 100644
Binary files a/img/spnsrs-overview/meego.png and b/img/spnsrs-overview/meego.png differ
diff --git a/img/spnsrs/denhaag.png b/img/spnsrs/denhaag.png
new file mode 100644
index 0000000..6f6e42e
Binary files /dev/null and b/img/spnsrs/denhaag.png differ
diff --git a/img/spnsrs/fluendo.png b/img/spnsrs/fluendo.png
new file mode 100644
index 0000000..1ed186e
Binary files /dev/null and b/img/spnsrs/fluendo.png differ
diff --git a/img/spnsrs/flumotion.png b/img/spnsrs/flumotion.png
new file mode 100644
index 0000000..60890d3
Binary files /dev/null and b/img/spnsrs/flumotion.png differ
diff --git a/img/spnsrs/hxx.png b/img/spnsrs/hxx.png
new file mode 100644
index 0000000..86daa12
Binary files /dev/null and b/img/spnsrs/hxx.png differ
diff --git a/img/spnsrs/meego.png b/img/spnsrs/meego.png
index 351d41f..8d83fac 100644
Binary files a/img/spnsrs/meego.png and b/img/spnsrs/meego.png differ
diff --git a/img/tgood-speakers/stevegeorge2010m.jpg b/img/tgood-speakers/stevegeorge2010m.jpg
new file mode 100644
index 0000000..8743331
Binary files /dev/null and b/img/tgood-speakers/stevegeorge2010m.jpg differ
diff --git a/pages/conference/ConferenceHandler.inc.php b/pages/conference/ConferenceHandler.inc.php
index dc81d1d..46b278b 100644
--- a/pages/conference/ConferenceHandler.inc.php
+++ b/pages/conference/ConferenceHandler.inc.php
@@ -21,6 +21,28 @@ class ConferenceHandler extends Handler {
 	 */
 	function index($args) {
 		list($conference, $schedConf) = parent::validate(true, false);
+    
+        /* START Flumotion streaming */
+        // create curl resource
+        $ch = curl_init();
+
+        // set url
+        $streamNumber = 1;
+        $streamList = sprintf("http://live%d.guadec.stream.flumotion.com/guadec/live%d.webm.m3u";, $streamNumber, $streamNumber);
+        curl_setopt($ch, CURLOPT_URL, $streamList);
+
+        //return the transfer as a string
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+
+        // $output contains the output string
+        $output = curl_exec($ch);
+
+        // close curl resource to free up system resources
+        curl_close($ch);
+        
+        $lines = explode("\n", $output);
+        $streamurl = $lines[2];
+        /* END Flumotion streaming */
 
 		$templateMgr = &TemplateManager::getManager();
 
@@ -35,6 +57,21 @@ class ConferenceHandler extends Handler {
 		$templateMgr->assign('homepageImage', $conference->getLocalizedSetting('homepageImage'));
 		$templateMgr->assign('description', $conference->getLocalizedSetting('description'));
 		$templateMgr->assign('conferenceTitle', $conference->getConferenceTitle());
+        switch ((int)$streamNumber) {
+            case 1:
+                $streamRoom = "Paris";
+                break;
+            case 2:
+                $streamRoom = "Copenhagen";
+                break;
+            case 3:
+                $streamRoom = "Seville";
+                break;
+        }
+        $templateMgr->assign('streamList', $streamList);
+		$templateMgr->assign('streamNumber', $streamNumber); 
+        $templateMgr->assign('streamRoom', $streamRoom);     
+		$templateMgr->assign('streamurl', $streamurl);
 
 		$schedConfDao = &DAORegistry::getDAO('SchedConfDAO');
 		$currentSchedConfs = &$schedConfDao->getCurrentSchedConfs($conference->getConferenceId());
diff --git a/pages/livestreamscreen/LivestreamscreenHandler.inc.php b/pages/livestreamscreen/LivestreamscreenHandler.inc.php
new file mode 100644
index 0000000..73757df
--- /dev/null
+++ b/pages/livestreamscreen/LivestreamscreenHandler.inc.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * @file LivestreamHandler.inc.php
+ *
+ * Copyright (c) 2010 Sense Hofstede <qense ubuntu com>
+ * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+ *
+ * @class LivestreamscreenHandler
+ * @ingroup pages_livestreamscreen
+ *
+ * @brief Show a live feed of microblogging activity
+ */
+
+
+class LivestreamscreenHandler extends Handler {
+
+	/**
+	 * Display livestream index page.
+	 */
+	function index() {
+		parent::validate();
+
+		$templateMgr = &TemplateManager::getManager();
+		$templateMgr->setCacheability(CACHEABILITY_PUBLIC);
+
+		$templateMgr->append('stylesheets', Request::getBaseUrl() . "/styles/livestreamscreen.css");
+		$templateMgr->append('javascripts', "http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js";);
+		$templateMgr->append('javascripts', Request::getBaseUrl() . "/js/livestream.js");
+
+		$templateMgr->assign('pageTitle', "Conference livestream");
+	
+		$templateMgr->display('livestreamscreen/index.tpl');
+	}
+}
+
+?>
diff --git a/pages/livestreamscreen/index.php b/pages/livestreamscreen/index.php
new file mode 100644
index 0000000..65ee99a
--- /dev/null
+++ b/pages/livestreamscreen/index.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @defgroup pages_livestreamscreen
+ */
+ 
+/**
+ * @file index.php
+ *
+ * Copyright (c) 2000-2009 John Willinsky
+ * Copyright (c) 2010 Sense Hofstede <qense ubuntu com>
+ * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+ *
+ * @brief Show a live feed of microblogging activity
+ *
+ * @ingroup pages_livestreamscreen
+ */
+
+define('HANDLER_CLASS', 'LivestreamscreenHandler');
+
+import('pages.livestreamscreen.LivestreamscreenHandler');
+
+?>
diff --git a/pages/streams/StreamsHandler.inc.php b/pages/streams/StreamsHandler.inc.php
new file mode 100644
index 0000000..a9fb1d0
--- /dev/null
+++ b/pages/streams/StreamsHandler.inc.php
@@ -0,0 +1,93 @@
+<?php
+
+/**
+ * @file StreamsHandler.inc.php
+ *
+ * Copyright (c) 2010 Sense Hofstede <sense ubuntu com>
+ * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+ *
+ * @class StreamsHandler
+ * @ingroup pages_streams
+ *
+ * @brief Make it possible to watch the three streams
+ */
+
+function getStreamUrl($streamlist) {
+    /* START Flumotion streaming */
+    // create curl resource
+    $ch = curl_init();
+
+    // set url
+    curl_setopt($ch, CURLOPT_URL, $streamlist);
+
+    //return the transfer as a string
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+
+    // $output contains the output string
+    $output = curl_exec($ch);
+
+    // close curl resource to free up system resources
+    curl_close($ch);
+    
+    $lines = explode("\n", $output);
+    $streamurl = $lines[2];
+    /* END Flumotion streaming */
+
+    return $streamurl;
+}
+
+class StreamsHandler extends Handler {
+
+	/**
+	 * Display the choice of the three streams
+	 */
+	function index() {
+		parent::validate();
+
+		$templateMgr = &TemplateManager::getManager();
+		$templateMgr->setCacheability(CACHEABILITY_PUBLIC);
+
+		$templateMgr->append('stylesheets', Request::getBaseUrl() . "/styles/streams.css");
+		$templateMgr->assign('pageTitle', "Live Video Streams");
+	
+		$templateMgr->display('streams/index.tpl');
+	}
+
+    /**
+     Show a certain stream
+     */
+    function stream() {
+        $streamNumber = $_GET['number'];
+        if (is_numeric($streamNumber) && (int)$streamNumber >= 1 && (int)$streamNumber <= 3) {
+            parent::validate();
+            $streamList = sprintf("http://live%d.guadec.stream.flumotion.com/guadec/live%d.webm.m3u";, $streamNumber, $streamNumber);
+            switch ((int)$streamNumber) {
+                case 1:
+                    $streamRoom = "Paris";
+                    break;
+                case 2:
+                    $streamRoom = "Copenhagen";
+                    break;
+                case 3:
+                    $streamRoom = "Seville";
+                    break;
+            }
+            
+		    $templateMgr = &TemplateManager::getManager();
+
+		    $templateMgr->append('stylesheets', Request::getBaseUrl() . "/styles/streams.css");
+		    $templateMgr->assign('pageTitle', sprintf("Live Video Stream '%s'", $streamRoom));
+
+            $templateMgr->assign('streamList', $streamList);
+		    $templateMgr->assign('streamUrl', getStreamUrl($streamList));
+		    $templateMgr->assign('streamNumber', $streamNumber);
+
+        	$templateMgr->assign('pageHierarchy', array(
+    			array(Request::url('guadec', '2010', 'streams'), "Live Video Streams", true)));
+
+		    $templateMgr->display('streams/stream.tpl');
+        } else {
+        }
+    }
+}
+?>
diff --git a/pages/streams/index.php b/pages/streams/index.php
new file mode 100644
index 0000000..336cb26
--- /dev/null
+++ b/pages/streams/index.php
@@ -0,0 +1,23 @@
+<?php
+
+/**
+ * @defgroup pages_streams
+ */
+ 
+/**
+ * @file index.php
+ *
+ * Copyright (c) 2000-2009 John Willinsky
+ * Copyright (c) 2010 Sense Hofstede <sense ubuntu com>
+ * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+ *
+ * @brief Show a live feed of microblogging activity
+ *
+ * @ingroup pages_streams
+ */
+
+define('HANDLER_CLASS', 'StreamsHandler');
+
+import('pages.streams.StreamsHandler');
+
+?>
diff --git a/styles/livestream.css b/styles/livestream.css
index 0f190ae..d091f28 100644
--- a/styles/livestream.css
+++ b/styles/livestream.css
@@ -40,7 +40,7 @@ tr.flickr td.time {
     background: url('../img/livestream/flickr.png') center left no-repeat;
 }
 tr.identica td.time {
-    background: url('../img/livestream/button-red.png') center left no-repeat;
+    background: url('../img/livestream/identi.png') center left no-repeat;
 }
 tr.picasa td.time { 
     background: url('../img/livestream/picasa.png') center left no-repeat;
diff --git a/styles/livestreamscreen.css b/styles/livestreamscreen.css
new file mode 100644
index 0000000..3375821
--- /dev/null
+++ b/styles/livestreamscreen.css
@@ -0,0 +1,65 @@
+/**
+ * lifestream.css
+ *
+ * Copyright (C) 2009, Canonical Ltd, thanks to the Ubuntu Website team
+ * Copyright (C) 2010, Sense Hofstede <sense ubuntu com>
+ *
+ * Stylesheet for the livestreamscreen.
+ */
+
+/**
+ * Alignment
+ */
+p.desc {
+    text-align: center;
+    font-size: 20pt;
+}
+td {
+  padding: 4px;
+  margin: 4px;
+}
+td.time {
+  padding-left: 40px;
+}
+
+tr.odd {
+    background-color: #ffffff;
+}
+
+tr.even {
+    background-color: #9FD1D6;
+}
+
+/**
+ * Images
+ */ 
+
+/* This is for making the images work */
+a img {border:none;}
+td.source {
+    display: none;
+}
+
+tr.flickr td.time {
+    background: url('../img/livestreamscreen/flickr.png') center left no-repeat;
+}
+tr.identica td.time {
+    background: url('../img/livestreamscreen/identi.png') center left no-repeat;
+}
+tr.picasa td.time { 
+    background: url('../img/livestreamscreen/picasa.png') center left no-repeat;
+}
+tr.twitter td.time {
+    background: url('../img/livestreamscreen/twitter.png') center left no-repeat;
+}
+tr.youtube td.time {
+    background: url('../img/livestreamscreen/youtube.png') center left no-repeat;
+}
+
+#content {
+    width: 100%;
+}
+
+#content #t {
+    font-size:20pt;
+}
diff --git a/styles/sponsors.css b/styles/sponsors.css
index 7801316..6637b92 100644
--- a/styles/sponsors.css
+++ b/styles/sponsors.css
@@ -15,3 +15,8 @@
 #sponsors .heading {
     text-align: center;
 }
+
+#sponsors h4 {
+    padding: 0;
+    margin: 0;
+}
diff --git a/styles/streams.css b/styles/streams.css
new file mode 100644
index 0000000..872eb97
--- /dev/null
+++ b/styles/streams.css
@@ -0,0 +1,55 @@
+/**
+ * streams.css
+ *
+ * Copyright (C) 2010, Sense Hofstede <qense ubuntu com>
+ *
+ * Stylesheet for the livestreamscreen.
+ */
+
+#browser-support table,
+#mediaplayer-support table {
+    text-align: left;
+    width: 560px;
+}
+
+#streams table th,
+#streams table td {
+    padding-right: 30px;
+}
+
+#streams .green {
+    background: #49F227;
+}
+
+#streams .yellow {
+    background: #DEF227;
+}
+
+#streams .red {
+    background: #F22A27;
+}
+
+#streams table a,
+#streams table a:link,
+#streams table a:active {
+    color: #000;
+}
+#streams table a:visited {
+    color: #111;
+}
+#streams table a:hover {
+    color: #222;
+}
+#streams .a_stream {
+    text-align: center;
+    float: left;
+    font-size: 18pt;
+    font-weight: bold;
+    margin: 0 0 0 3px;
+}
+
+#streams .a_stream em{
+    font-size: 7pt;
+    font-weight: normal;
+    margin: 0;
+}
diff --git a/templates/common/footer.small.tpl b/templates/common/footer.small.tpl
new file mode 100644
index 0000000..923a473
--- /dev/null
+++ b/templates/common/footer.small.tpl
@@ -0,0 +1,111 @@
+{**
+ * footer.tpl
+ *
+ * Copyright (c) 2000-2009 John Willinsky
+ * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+ *
+ * Common site footer.
+ *
+ * $Id: footer.tpl,v 1.8.2.2 2009/04/17 06:45:47 jmacgreg Exp $
+ *}
+ 
+    </div>
+
+    {if $postCreativeCommons}
+	{translate key="common.ccLicense"}
+    {/if}
+
+    {call_hook name="Templates::Common::Footer::PageFooter"}
+
+    {get_debug_info}
+    
+    
+    <div id="footer">
+        <div class="container_16">
+            
+            <div class="grid_4">
+                <img src="{$baseUrl}/img/the-hague-footer-logo.png" alt="GNOME" />
+            </div>
+            
+            <div class="grid_3">
+                <ul>
+                    <li><a href="{url conference="index" schedConf="index" op="index"}"><strong>Home</strong></a></li>
+                    <li><a href="https://register.guadec.org/";>Registration</a></li>
+                    <li><a href="http://live.gnome.org/GUADEC/2010";>Wiki</a></li>
+                    
+                    {if $isUserLoggedIn}
+		                <li><a href="{url page="user"}">{translate key="navigation.userHome"}</a></li>
+	                {else}
+		                <li><a href="{url page="login"}">{translate key="navigation.login"}</a></li>
+	                {/if}
+                </ul>
+            </div>
+            <div class="grid_3">
+                <ul>
+                    <li><a href="{$baseUrl}/index.php/guadec/2010/"><strong>The Conference</strong></a></li>
+                    <li><a href="{url page="announcement"}">Announcements</a></li>
+                    <li><a href="{$baseUrl}/index.php/guadec/2010/schedConf/overview">Schedule</a></li>
+                    <li><a href="{$baseUrl}/index.php/guadec/2010/schedConf/training">Developer Training</a></li>
+                </ul>
+            </div>
+            <div class="grid_3">
+                <ul>
+                    <li><a href="{$baseUrl}/index.php/guadec/2010/schedConf/accommodation"><strong>Accomodation</strong></a></li>
+                    <li><a href="{$baseUrl}/index.php/guadec/2010/schedConf/accommodation#hotels">Hotels and Hostels</a></li>
+                    <li><a href="{$baseUrl}/index.php/guadec/2010/schedConf/accommodation#transportation">Transportation</a></li>
+                    <li><a href="{$baseUrl}/index.php/guadec/2010/schedConf/accommodation#map">City Map</a></li>
+                </ul>
+            </div>
+            <div class="grid_3">
+                <ul>
+                    <li><a href="{$baseUrl}/index.php/guadec/2010/livestream"><strong>Media Livestream</strong></a></li>
+                    <li><a href="http://planet.gnome.org";>Aggregated GNOME blogs</a></li>
+                    <li><a href="http://identi.ca/guadec";>Follow us on Identi.ca</a></li>
+                    <li><a href="http://twitter.com/guadec";>Follow us on Twitter</a></li>
+                </ul>
+            </div>
+            
+            <div class="copyright grid_16">
+                Â© 2010 <a href="http://www.gnome.org/";>The GNOME Project
+            </div>
+            
+            <div class="clear"></div>
+        <div>
+    </div>
+    
+{if $enableDebugStats}
+<div id="footer">
+	<div id="footerContent">
+		<div class="debugStats">
+		{translate key="debug.executionTime"}: {$debugExecutionTime|string_format:"%.4f"}s<br />
+		{translate key="debug.databaseQueries"}: {$debugNumDatabaseQueries|escape}<br/>
+		{if $debugNotes}
+			<strong>{translate key="debug.notes"}</strong><br/>
+			{foreach from=$debugNotes item=note}
+				{translate key=$note[0] params=$note[1]}<br/>
+			{/foreach}
+		{/if}
+		</div>
+	</div><!-- footerContent -->
+</div><!-- footer -->
+{/if}
+
+</div><!-- container -->
+
+{literal}
+<!-- Piwik -->
+<script type="text/javascript">
+var pkBaseURL = (("https:" == document.location.protocol) ? "https://webstats.gnome.org/"; : "http://webstats.gnome.org/";);
+document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
+</script><script type="text/javascript">
+try {
+var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 9);
+piwikTracker.trackPageView();
+piwikTracker.enableLinkTracking();
+} catch( err ) {}
+</script><noscript><p><img src="http://webstats.gnome.org/piwik.php?idsite=9"; style="border:0" alt=""/></p></noscript>
+<!-- End Piwik Tag -->
+{/literal}
+
+</body>
+</html>
diff --git a/templates/common/footer.tpl b/templates/common/footer.tpl
index 20ddbdc..ecb2418 100644
--- a/templates/common/footer.tpl
+++ b/templates/common/footer.tpl
@@ -31,6 +31,9 @@
     
     
     <div id="footer">
+        <div id="thehaguelogo">
+            <a href="http://www.denhaag.com/"; rel="external" title="Municipality of The Hague"><img src="{$baseUrl}/img/spnsrs/denhaag.png" alt="The Hague"/></a>
+        </div><!-- thehaguelogo -->
         <div class="container_16">
             
             <div class="grid_4">
diff --git a/templates/common/header.small.tpl b/templates/common/header.small.tpl
new file mode 100644
index 0000000..0584429
--- /dev/null
+++ b/templates/common/header.small.tpl
@@ -0,0 +1,44 @@
+{**
+ * header.tpl
+ *
+ * Copyright (c) 2000-2009 John Willinsky
+ * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+ *
+ * Common site header.
+ *
+ * $Id: header.tpl,v 1.26.2.1 2009/04/08 20:45:51 asmecher Exp $
+ *}
+{if !$pageTitleTranslated}{translate|assign:"pageTitleTranslated" key=$pageTitle}{/if}
+{if $pageCrumbTitle}{translate|assign:"pageCrumbTitleTranslated" key=$pageCrumbTitle}{elseif !$pageCrumbTitleTranslated}{assign var="pageCrumbTitleTranslated" value=$pageTitleTranslated}
+{/if}
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html>
+<html>
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset={$defaultCharset|escape}" />
+	<title>{$pageTitleTranslated}</title>
+	<meta name="description" content="{$metaSearchDescription|escape}" />
+	<meta name="keywords" content="{$metaSearchKeywords|escape}" />
+	<meta name="generator" content="{translate key="common.openConferenceSystems"} {$currentVersionString|escape}" />
+
+	{$metaCustomHeaders}
+
+    {assign var="lastUpdateCss" value="?2010-04-25"}
+    <link href="{$baseUrl}/css/grid.css{$lastUpdateCss}" rel="stylesheet" type="text/css" />
+    <link href="{$baseUrl}/css/template.css{$lastUpdateCss}" rel="stylesheet" type="text/css" />
+    <link href="{$baseUrl}/css/index.css{$lastUpdateCss}" rel="stylesheet" type="text/css" />
+    <link href="{$baseUrl}/css/news.css{$lastUpdateCss}" rel="stylesheet" type="text/css" />
+	{foreach from=$stylesheets item=cssUrl}
+	<link rel="stylesheet" href="{$cssUrl}" type="text/css" />
+	{/foreach}
+
+	<script type="text/javascript" src="{$baseUrl}/js/general.js"></script>
+    {foreach from=$javascripts item=jsUrl name=wsfoo}
+	<script type="text/javascript" src="{$jsUrl}"></script>
+	{/foreach}
+	{$smart.foreach.wsfoo.total}
+	
+	{$additionalHeadData}
+</head>
+<body>
+    <div id="content">
diff --git a/templates/conference/index.tpl b/templates/conference/index.tpl
index 98ab363..60979a3 100644
--- a/templates/conference/index.tpl
+++ b/templates/conference/index.tpl
@@ -14,10 +14,16 @@
 {assign var="hideTitle" value="true"}
 {include file="common/header.tpl"}
 
-                <div>
-                    <p>
-                         <a href="http://register.guadec.org/"; title="GUADEC 2010 registration"><img src="{$baseUrl}/img/register_now.png" alt="Register Now" style="position:absolute; top: -40px; right: 0px; float: right;"/></a>
-                     </p>
+                <div id="attention-nav">
+                    <ul>
+                        <li><a href="{url conference="guadec" schedConf="2010" page="schedConf" op="accommodation" anchor="venue"}" title="Venue">Venue</a></li>
+                        <li><a href="{url conference="guadec" schedConf="2010" page="schedConf" op="accommodation" anchor="accommodation"}" title="Accommodation">Accommodation</a></li>
+                        <li><a href="{url conference="guadec" schedConf="2010" page="livestream"}" title="Social Media Livestream">Social Media Livestream</a></li>
+                        <li><a href="/docs/party_map.pdf" title"GUADEC 2010 Parties on the map">Parties Map</a></li>
+                    </ul>
+                    {*<p style="position:absolute; top: -40px; right: 0px; float: right;>       
+                        <a href="http://register.guadec.org/"; title="GUADEC 2010 registration"><img src="{$baseUrl}/img/register_now.png" alt="Register Now"/></a>
+                     </p>*}
                 </div>
 
                 <div class="grid_6 alpha">
@@ -37,19 +43,63 @@
                     
                 </div>
                 
-                <div class="grid_10 omega">
-                    <h2>Video message from Neelie Kroes</h2>
-
-                    <object width="560" height="340">
-                        <param name="movie" value="http://www.youtube-nocookie.com/v/ok100U4Fo3Y&amp;hl=en_GB&amp;fs=1?rel=0";></param>
-                        <param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param>
-                        <embed src="http://www.youtube-nocookie.com/v/ok100U4Fo3Y&amp;fs=1?rel=0"; type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="560" height="340">
-                        </embed>
-                    </object>
-                                       
-                    <p>
-                    <em>Neelie Kroes is European Commissioner for Digital Agenda and Vice-President of the European Commission. <a href="http://ec.europa.eu/commission_2010-2014/kroes/index_en.htm"; rel="external" title="Neelie Kroes - European Commission - EUROPA">More information about her.</a></em>
-                    </p>
+                <div class="grid_10 omega" id="frontstream">
+            <h2 class="flickr"><abbr title="GNOME Usersâ?? And Developersâ?? European Conference">GUADEC</abbr> 2010 on <span style="color: #3465a4;">Flick</span><span style="color: #ff048c;">r</span></h2>
+                        
+                        <div class="flickrPhotos">
+                            <a href="http://www.flickr.com/photos/guadec2010/4840844013/";><img src="http://farm5.static.flickr.com/4104/4840844013_8cc498c80d_s.jpg"; alt="" /></a>
+                            <a href="http://www.flickr.com/photos/guadec2010/4838134638/";><img src="http://farm5.static.flickr.com/4125/4838134638_2e4f816859_s.jpg"; alt="" /></a>
+<a href="http://www.flickr.com/photos/mariosp/4840485808/"; title="Den Haag HS by mariosp, on Flickr"><img src="http://farm5.static.flickr.com/4144/4840485808_afb7742af1_s.jpg"; width="75" height="75" alt="Den Haag HS" /></a>
+                            <a href="http://www.flickr.com/photos/guadec2010/4841460016/";><img src="http://farm5.static.flickr.com/4153/4841460016_a042befe06_s.jpg"; alt="" /></a>
+                            <a href="http://www.flickr.com/photos/qense/4846339972/"; title="GUADEC 2010 venue at Friday morning by Sense Hofstede, on Flickr"><img src="http://farm5.static.flickr.com/4084/4846339972_9ee47bbbe1_s.jpg"; alt="GUADEC 2010 venue at Friday morning" /></a>
+                            <a href="http://www.flickr.com/photos/guadec2010/4837522587/";><img src="http://farm5.static.flickr.com/4150/4837522587_43ac17d13f_s.jpg"; alt="" /></a>
+                            <a href="http://www.flickr.com/photos/guadec2010/4837522109/";><img src="http://farm5.static.flickr.com/4087/4837522109_9d20391112_s.jpg"; alt="" /></a>
+                            <a href="http://www.flickr.com/photos/guadec2010/4838133492/";><img src="http://farm5.static.flickr.com/4088/4838133492_caa4136dd2_s.jpg"; alt="" /></a>
+                            <a href="http://www.flickr.com/photos/guadec2010/4837274054/";><img src="http://farm5.static.flickr.com/4113/4837274054_57232d5649.jpg"; alt="" /></a>
+                            <a href="http://www.flickr.com/photos/guadec2010/4836662023/";><img src="http://farm5.static.flickr.com/4089/4836662023_d8fc950007_s.jpg"; alt="" /></a>
+                            <a href="http://www.flickr.com/photos/guadec2010/4836659933/";><img src="http://farm5.static.flickr.com/4149/4836659933_1abca2e7c1_s.jpg"; alt="" /></a>
+                            <a href="http://www.flickr.com/photos/guadec2010/4836659891/";><img src="http://farm5.static.flickr.com/4110/4836659891_cee777bb11_s.jpg"; alt="" /></a>
+                            <a href="http://www.flickr.com/photos/guadec2010/4837271586/";><img src="http://farm5.static.flickr.com/4105/4837271586_e47986620e_s.jpg"; alt="" /></a>
+                            <a href="http://www.flickr.com/photos/guadec2010/4837271004/";><img src="http://farm5.static.flickr.com/4130/4837271004_4e3c0e616c_s.jpg"; alt="" /></a>
+                            <a href="http://www.flickr.com/photos/guadec2010/4837270196/";><img src="http://farm5.static.flickr.com/4125/4837270196_96ca428653_s.jpg"; alt="" /></a>
+                            <a href="http://www.flickr.com/photos/guadec2010/4837270478/";><img src="http://farm5.static.flickr.com/4087/4837270478_67fb1f0278_s.jpg"; alt="" /></a>
+                            <a href="http://www.flickr.com/photos/guadec2010/4837522723/";><img src="http://farm5.static.flickr.com/4124/4837522723_d7d8587b37_s.jpg"; alt="" /></a>
+                            <a href="http://www.flickr.com/photos/guadec2010/4841462332/";><img src="http://farm5.static.flickr.com/4124/4841462332_b6410c055e_s.jpg"; alt="" /></a>
+                            <a href="http://www.flickr.com/photos/mdkflickr/4843340635/";><img src="http://farm5.static.flickr.com/4148/4843340635_4022f37b56_s.jpg"; alt="" /></a>
+                            <a href="http://www.flickr.com/photos/mdkflickr/4843338611/";><img src="http://farm5.static.flickr.com/4108/4843338611_ffdc02d580_s.jpg"; alt="" /></a>
+                            <a href="http://www.flickr.com/photos/cmoi/4843189318/";><img src="http://farm5.static.flickr.com/4152/4843189318_c27ec55a06_s.jpg"; alt="" /></a>
+                            <a href="http://www.flickr.com/photos/mariosp/4840463870/"; title="Lake in The Hague by mariosp, on Flickr"><img src="http://farm5.static.flickr.com/4109/4840463870_fd671d6c7d_s.jpg"; alt="Lake in The Hague" /></a>
+                            <a href="http://www.flickr.com/photos/mariosp/4840484462/"; title="Xan and Fer's talk by mariosp, on Flickr"><img src="http://farm5.static.flickr.com/4111/4840484462_9c45bc37d4_s.jpg"; alt="Xan and Fer's talk" /></a>
+                            <a href="http://www.flickr.com/photos/gonzalemario/4840720086/"; title="DSC_0021 by gonzalemario, on Flickr"><img src="http://farm5.static.flickr.com/4091/4840720086_0496ba4ff1_s.jpg"; width="75" height="75" alt="DSC_0021" /></a>
+                            <a href="http://www.flickr.com/photos/gonzalemario/4840105623/"; title="DSC_0007 by gonzalemario, on Flickr"><img src="http://farm5.static.flickr.com/4109/4840105623_f62d4bc617_s.jpg"; width="75" height="75" alt="DSC_0007" /></a>
+                            <a href="http://www.flickr.com/photos/gonzalemario/4840729652/"; title="DSC_0042 by gonzalemario, on Flickr"><img src="http://farm5.static.flickr.com/4147/4840729652_14c119e217_s.jpg"; width="75" height="75" alt="DSC_0042" /></a>
+                            <a href="http://www.flickr.com/photos/cmoi/4843165688/"; title="IMG_8141 by pterjan, on Flickr"><img src="http://farm5.static.flickr.com/4132/4843165688_ab774b7d9e_s.jpg"; width="75" height="75" alt="IMG_8141" /></a>
+                            <a href="http://www.flickr.com/photos/cmoi/4843231248/"; title="IMG_8174 by pterjan, on Flickr"><img src="http://farm5.static.flickr.com/4107/4843231248_eff013bac0_s.jpg"; width="75" height="75" alt="IMG_8174" /></a>
+                            <a href="http://www.flickr.com/photos/cmoi/4843672874/"; title="Collabora Party by pterjan, on Flickr"><img src="http://farm5.static.flickr.com/4110/4843672874_398de8ec99_s.jpg"; width="75" height="75" alt="Collabora Party" /></a>
+                            <a href="http://www.flickr.com/photos/mariosp/4839872351/"; title="Xan and Fer's talk by mariosp, on Flickr"><img src="http://farm5.static.flickr.com/4124/4839872351_0d81627f3d_s.jpg"; width="75" height="75" alt="Xan and Fer's talk" /></a>
+                            <a href="http://www.flickr.com/photos/gonzalemario/4840731690/"; title="DSC_0052 by gonzalemario, on Flickr"><img src="http://farm5.static.flickr.com/4125/4840731690_99e27a1ae2_s.jpg"; width="75" height="75" alt="DSC_0052" /></a>
+                            <a href="http://www.flickr.com/photos/mdkflickr/4843336015/"; title="2010-07-26 15.13.17 by MdKflickr, on Flickr"><img src="http://farm5.static.flickr.com/4105/4843336015_c312b00892_s.jpg"; width="75" height="75" alt="2010-07-26 15.13.17" /></a>
+                            <a href="http://www.flickr.com/photos/mdkflickr/4843338339/"; title="2010-07-29 10.19.05 by MdKflickr, on Flickr"><img src="http://farm5.static.flickr.com/4128/4843338339_20d081a0d3_s.jpg"; width="75" height="75" alt="2010-07-29 10.19.05" /></a>
+                            <a href="http://www.flickr.com/photos/cmoi/4846661648/"; title="IMG_8211 by pterjan, on Flickr"><img src="http://farm5.static.flickr.com/4148/4846661648_f708969cc8_s.jpg"; width="75" height="75" alt="IMG_8211" /></a>
+                            <a href="http://www.flickr.com/photos/overdreamss/4837974528/"; title="Arquitectura Tipica II by Overdreamss, on Flickr"><img src="http://farm5.static.flickr.com/4105/4837974528_789a194420_s.jpg"; width="75" height="75" alt="Arquitectura Tipica II" /></a>
+                            <a href="http://www.flickr.com/photos/cmoi/4843601178/"; title="Collabora Party by pterjan, on Flickr"><img src="http://farm5.static.flickr.com/4110/4843601178_35808a6eee_s.jpg"; width="75" height="75" alt="Collabora Party" /></a>
+                            <a href="http://www.flickr.com/photos/mdkflickr/4843955886/"; title="2010-07-29 16.47.14 by MdKflickr, on Flickr"><img src="http://farm5.static.flickr.com/4083/4843955886_c93bb6c9a6_s.jpg"; width="75" height="75" alt="2010-07-29 16.47.14" /></a>
+                            <a href="http://www.flickr.com/photos/gonzalemario/4840730070/"; title="DSC_0043 by gonzalemario, on Flickr"><img src="http://farm5.static.flickr.com/4087/4840730070_1b33f2549a_s.jpg"; width="75" height="75" alt="DSC_0043" /></a>
+                            <a href="http://www.flickr.com/photos/gonzalemario/4840732156/"; title="DSC_0053 by gonzalemario, on Flickr"><img src="http://farm5.static.flickr.com/4090/4840732156_23a6c08ae2_s.jpg"; width="75" height="75" alt="DSC_0053" /></a>
+                            <a href="http://www.flickr.com/photos/cmoi/4842549135/"; title="IMG_8145 by pterjan, on Flickr"><img src="http://farm5.static.flickr.com/4089/4842549135_ac81a93951_s.jpg"; width="75" height="75" alt="IMG_8145" /></a>
+                            <a href="http://www.flickr.com/photos/cmoi/4842574257/"; title="IMG_8165 by pterjan, on Flickr"><img src="http://farm5.static.flickr.com/4092/4842574257_11f7859eb9_s.jpg"; width="75" height="75" alt="IMG_8165" /></a>
+                            <a href="http://www.flickr.com/photos/cmoi/4842576015/"; title="IMG_8168 by pterjan, on Flickr"><img src="http://farm5.static.flickr.com/4148/4842576015_2b171fa055_s.jpg"; width="75" height="75" alt="IMG_8168" /></a>
+                            <a href="http://www.flickr.com/photos/gonzalemario/4840108627/"; title="DSC_0020 by gonzalemario, on Flickr"><img src="http://farm5.static.flickr.com/4147/4840108627_8926743d44_s.jpg"; width="75" height="75" alt="DSC_0020" /></a>
+                            <a href="http://www.flickr.com/photos/gonzalemario/4840110669/"; title="DSC_0032 by gonzalemario, on Flickr"><img src="http://farm5.static.flickr.com/4107/4840110669_8584f25190_s.jpg"; width="75" height="75" alt="DSC_0032" /></a>
+                            <a href="http://www.flickr.com/photos/gonzalemario/4840109291/"; title="DSC_0022 by gonzalemario, on Flickr"><img src="http://farm5.static.flickr.com/4124/4840109291_6bc071a9de_s.jpg"; width="75" height="75" alt="DSC_0022" /></a>
+                            <a href="http://www.flickr.com/photos/mdkflickr/4843334953/"; title="2010-07-26 15.10.29 by MdKflickr, on Flickr"><img src="http://farm5.static.flickr.com/4154/4843334953_1a4b60824e_s.jpg"; width="75" height="75" alt="2010-07-26 15.10.29" /></a>
+                            <a href="http://www.flickr.com/photos/mariosp/4840484462/"; title="Xan and Fer's talk by mariosp, on Flickr"><img src="http://farm5.static.flickr.com/4111/4840484462_9c45bc37d4_s.jpg"; width="75" height="75" alt="Xan and Fer's talk" /></a>
+                            <a href="http://www.flickr.com/photos/mariosp/4840482582/"; title="Igalia banner by mariosp, on Flickr"><img src="http://farm5.static.flickr.com/4087/4840482582_52a20c7c1e_s.jpg"; width="75" height="75" alt="Igalia banner" /></a>
+                            <a href="http://www.flickr.com/photos/mariosp/4840463600/"; title="Waterloo statue by mariosp, on Flickr"><img src="http://farm5.static.flickr.com/4107/4840463600_f8a47ccb22_s.jpg"; width="75" height="75" alt="Waterloo statue" /></a>
+                        </div>
+                        <p>
+                            <em><a href="http://www.flickr.com/photos/tags/guadec/"; rel="external" title="Photos on Flickr with the tag 'guadec'">View more photos of GUADEC 2010.</a></em>
+                        </p>
                         
                     <h1>About GNOME</h1>
                     <p><img src="{$baseUrl}/img/gnome-logo.png" alt="The GNOME foot logo" style="float: left; margin: 5px 20px 0 0;" /><a href="http://www.gnome.org";>GNOME</a> is an open source project that provides an attractive, usable and accessible computer interface environment for million of users for free. But more than anything else, GNOME is a worldwide community of volunteers who hack, translate, design, QA, and generally have fun together.
@@ -158,6 +208,7 @@
         <h2><a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors"}" title="Sponsors">Sponsors</a></h3>
         <div style="background-color: #FFF; -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; -moz-box-shadow: inset 0 1px 5px #999; -webkit-box-shadow: 0 1px 5px #999; box-shadow: inset 0 1px 5px #999; margin-top: 20px; text-align: center; padding: 20px; line-height: 150%;">
             {* Silver sponsors *}
+            <h4>Silver sponsors</h4>
             <p>
             <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="canonical"}" title="Canonical"><img src="{$baseUrl}/img/spnsrs/canonical.png" alt="Canonical"/></a>
             </p>
@@ -180,9 +231,6 @@
             <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="linux-foundation"}" title="The Linux Foundation"><img src="{$baseUrl}/img/spnsrs/linux-foundation.png" alt="The Linux Foundation"/></a>
             </p>
             <p>
-            <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="linux-magazine"}" title="Linux Magazine"><img src="{$baseUrl}/img/spnsrs/linux-magazine.png" alt="Linux Magazine"/></a>
-            </p>
-            <p>
             <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="meego"}" title="MeeGo"><img src="{$baseUrl}/img/spnsrs/meego.png" alt="MeeGo"/></a>
             </p>
             <p>
@@ -198,22 +246,40 @@
             <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="ubuntu-user"}" title="Ubuntu User"><img src="{$baseUrl}/img/spnsrs/ubuntu-user.png" alt="Ubuntu User"/></a>
             </p>
             {* Bronze sponsors *}
+            <h4>Bronze sponsors</h4>
             <p>
             <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="arm"}" title="ARM"><img src="{$baseUrl}/img/spnsrs/arm.png" alt="ARM"/></a>
             </p>
             <p>
-            <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="openismus"}" title="Openismus"><img src="{$baseUrl}/img/spnsrs/openismus.png" alt="Openismus"/></a>
+            <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="hxx"}" title="Hxx Foundation"><img src="{$baseUrl}/img/spnsrs/hxx.png" alt="Hxx"/></a>
             </p>
             <p>
             <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="mozilla"}" title="Mozilla.org"><img src="{$baseUrl}/img/spnsrs/mozilla.png" alt="Mozilla"/></a>
             </p>
-            {* Other *}
+            <p>
+            <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="openismus"}" title="Openismus"><img src="{$baseUrl}/img/spnsrs/openismus.png" alt="Openismus"/></a>
+            </p>
+            {* Dutch sponsors *}
+            <h4>National sponsors</h4>
             <p>
             <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="nlnet"}" title="NLnet"><img src="{$baseUrl}/img/spnsrs/nlnet.png" alt="NLnet Foundation"/></a>
             </p>
             <p>
             <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="ictivity"}" title="Ictivity"><img src="{$baseUrl}/img/spnsrs/ictivity.png" alt="Ictivity"/></a>
             </p>
+            {* Video streaming sponsors *}
+            <h4>Video streaming</h4>
+            <p>
+            <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="fluendo"}" title="Fluendo"><img src="{$baseUrl}/img/spnsrs/fluendo.png" alt="Fluendo"/></a>
+            </p>
+            <p>
+            <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="flumotion"}" title="Flumotion"><img src="{$baseUrl}/img/spnsrs/flumotion.png" alt="Flumotion"/></a>
+            </p>
+            {* Media partner *}
+            <h4>Media partner</h4>
+            <p>
+            <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="linux-magazine"}" title="Linux Magazine"><img src="{$baseUrl}/img/spnsrs/linux-magazine.png" alt="Linux Magazine"/></a>
+            </p>
             {*Does your company want to sponsor GUADEC 2010? Look for information and an application form in the <a href="http://guadec.org/GUADEC 2010-final.pdf" title="GUADEC 2010 Sponsor's Brochure">Sponsor's Brochure</a>.*}
         </div>
     </div>
diff --git a/templates/livestreamscreen/index.tpl b/templates/livestreamscreen/index.tpl
new file mode 100644
index 0000000..4e19ec8
--- /dev/null
+++ b/templates/livestreamscreen/index.tpl
@@ -0,0 +1,26 @@
+{**
+ * index.tpl
+ *
+ * Copyright (c) 2010 Sense Hofstede <qense ubuntu com>
+ * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+ *
+ * View the livestream
+ *
+ *}
+{assign var="pageTitleTranslated" value="Conference livestream"}
+{include file="common/header.small.tpl"}
+
+{literal}
+<script type="text/javascript">
+$(document).ready(function(){ls.init("GUADEC", $("#t")[0])});
+</script>
+{/literal}
+
+<table id="t" cellspacing="5"></table>
+
+<p>
+<em>Lifestream based on <a href="https://launchpad.net/udstream"; title="UDStream on Launchpad">UDStream</a>, social media icons from <a href="http://icondock.com/free/vector-social-media-icons"; title="Vector Social Media Icons - Icon Dock">'Vector Social Media Icons'</a> under the <a href="http://creativecommons.org/licenses/by-sa/3.0/"; title="Creative Commons &mdash;
+      Attribution-Share Alike 3.0 Unported">Creative Commons Attribution-Share Alike 3.0 Unported License</a></em>
+</p>
+
+{include file="common/footer.tpl"}
diff --git a/templates/schedConf/index.tpl b/templates/schedConf/index.tpl
index 326b259..4ac0a32 100644
--- a/templates/schedConf/index.tpl
+++ b/templates/schedConf/index.tpl
@@ -49,7 +49,8 @@
     <div class="headline">Important information</div>
 
     <ul class="navigationList">
-	    {if $schedConfPostOverview}<li><a href="{url page="schedConf" op="overview"}">{translate key="schedConf.overview"}</a></li>{/if}
+	    <li><a href="{url page="streams"}" title="Video Live Streams">Video Live Streams</a></li>
+	    {if $schedConfPostOverview}<li><a href="{url page="schedConf" op="overview"}">Schedule overview</a></li>{/if}
 	    {if $schedConfShowCFP}
 		    <li><a href="{url page="schedConf" op="cfp"}">{translate key="schedConf.cfp"}</a>{if $submissionsOpenDate} ({$submissionsOpenDate|date_format:$dateFormatLong} - {$submissionsCloseDate|date_format:$dateFormatLong}){/if}</li>
 	    {/if}
@@ -61,8 +62,7 @@
 	    {if $schedConfPostPresentations}<li><a href="{url page="schedConf" op="presentations"}">{translate key="schedConf.presentations.short"}</a></li>{/if}
 	    {if $schedConfPostSchedule}<li><a href="{url page="schedConf" op="schedule"}">{translate key="schedConf.schedule"}</a></li>{/if}
 	    {if $schedConfPostPayment}<li><a href="{url page="schedConf" op="registration"}">{translate key="schedConf.registration"}</a></li>{/if}
-	    {if $schedConfPostAccommodation}<li><a href="{url page="schedConf" op="accommodation" anchor="hotels"}">{translate key="schedConf.accommodation"}</a></li>{/if}
-	    {if $schedConfPostAccommodation}<li><a href="{url page="schedConf" op="accommodation" anchor="venue"}">Venue</a></li>{/if}
+	    {if $schedConfPostAccommodation}<li><a href="{url page="schedConf" op="accommodation"}">{translate key="schedConf.accommodation"} and Venue</a></li>{/if}
 	    {if $schedConfPostSupporters}<li><a href="{url page="about" op="organizingTeam"}">{translate key="schedConf.supporters"}</a></li>{/if}
 	    {if $schedConfPostTimeline}<li><a href="{url page="schedConf" op="timeline"}">{translate key="schedConf.timeline"}</a></li>{/if}
 	    <li><a href="{url page="schedConf" op="sponsors"}" title="Sponsors">Sponsors</a></li>
diff --git a/templates/schedConf/opendesktopday.tpl b/templates/schedConf/opendesktopday.tpl
index 83cc212..7a6e23b 100644
--- a/templates/schedConf/opendesktopday.tpl
+++ b/templates/schedConf/opendesktopday.tpl
@@ -61,8 +61,8 @@ Registration is at <a href="https://register.guadec.org/";>register.guadec.org</a
                     <tr>
                         <td>9:30 - 11:00</td>
                         <td>
-                            <strong>Information market</strong><br/><br/>
-                            A chance to stroll around the floor and connect with companies who offer products related to free and open software, or services related to the desktop.
+                            <font color="gray"><strong>Information market</strong><br/><br/>
+                            <font color="black"><em>CANCELLED</em></font>
                         </td>
                     </tr>
                     <tr>
diff --git a/templates/schedConf/sponsors.tpl b/templates/schedConf/sponsors.tpl
index 720fd49..4167588 100644
--- a/templates/schedConf/sponsors.tpl
+++ b/templates/schedConf/sponsors.tpl
@@ -21,10 +21,27 @@
 <div class="clear"></div>
 
 {* Silver sponsors *}
+
+<div class="grid_4 alpha">
+<h4>Silver sponsors</h4>
+</div>
+
+<div class="grid_4">&nbsp;</div>
+<div class="grid_4">&nbsp;</div>
+<div class="grid_4 omega">&nbsp;</div>
+
+
+<div class="clear"></div>
+
 <div class="grid_4 alpha" itemscope itemtype="http://data-vocabulary.org/Organization";>
 <p class="heading">
 <a lang="en-GB" href="http://www.canonical.com/"; rel="external" itemprop="url" title="Canonical"><img src="{$baseUrl}/img/spnsrs-overview/canonical.png" alt="Canonical" id="canonical"/></a>
 </p>
+
+<p>
+<strong>Canonical is organising the party in cafe 'Le Paris' on Wednesday.</strong>
+</p>
+
 <p>
 As a member of the free software community, <span itemprop="name">Canonical</span> is committed to supporting the development of the open source ecosystem. Our employees are passionate about technology, open source and, of course, Ubuntu.</p>
 
@@ -45,6 +62,10 @@ Learn more at <a lang="en-GB" href="http://www.canonical.com/"; itemprop="url" re
 </p>
 
 <p>
+<strong>Collabora is organising the beach BBQ party on Thursday at Scheveningen.</strong>
+</p>
+
+<p>
 <span itemprop="name">Collabora</span> is a multinational Open Source consultancy specializing in bringing companies and the Open Source software community together.</p>
 
 <p>We give clients the knowledge, experience and infrastructure to allow them to become an integral part of the Open Source community. We provide a full range of services based around Open Source technologies including architecture, software development, project management, infrastructure and community development. We are skilled in a wide range of areas from consumer devices to multimedia and real-time communications systems. Collabora prides itself in creating a network of Open Source experts from all around the world.
@@ -164,27 +185,11 @@ Learn more at <a href="http://www.linuxfoundation.org/"; rel="external" itemprop=
 <div class="grid_4 omega" itemscope itemtype="http://data-vocabulary.org/Organization";>
 
 <p class="heading">
-<a href="http://www.linux-magazine.com/"; rel="external" itemprop="url" title="Linux Magazine Online (English)"><img src="{$baseUrl}/img/spnsrs-overview/linux-magazine.png" alt="Linux Magazine" id="linux-magazine"/></a>
-</p>
-<p>
-<span itemprop="name">Linux Magazine</span> is a monthly magazine serving readers in over 50 countries.
-</p>
-<p>
-<abbr title="GNOME Users&#146; And Developers&#146; European Conference">GUADEC</abbr> 2010 is sponsored by Linux Magazine
-    <a href="http://www.linux-magazine.com/"; rel="external" itemprop="url" title="Linux Magazine Online (UK/International)">International</a>,
-    <a lang="de-DE" href="http://www.linux-magazin.de/"; rel="external" itemprop="url" title="Linux-Magazin Online (Deutschland)">Germany</a>,
-    <a lang="pl-PL" href="http://www.linux-magazine.pl/"; rel="external" itemprop="url" title="Linux Magazine (Polska)">Poland</a> and
-    <a lang="es-ES" href="http://www.linux-magazine.es/"; rel="external" itemprop="url" title="Linux Magazine (EspaÃ±a)">Spain</a>.
+<a  href="http://meego.com/"; rel="external" itemprop="url" title="MeeGo"><img src="{$baseUrl}/img/spnsrs-overview/meego.png" alt="MeeGo" id="meego"/></a>
 </p>
 
-</div>
-
-<div class="clear"></div>
-
-<div class="grid_4 alpha" itemscope itemtype="http://data-vocabulary.org/Organization";>
-
-<p class="heading">
-<a  href="http://meego.com/"; rel="external" itemprop="url" title="MeeGo"><img src="{$baseUrl}/img/spnsrs-overview/meego.png" alt="MeeGo" id="meego"/></a>
+<p>
+<strong>MeeGo is sponsoring the refreshments and snacks during the main conference.</strong>
 </p>
 
 <p>
@@ -193,8 +198,9 @@ Learn more at <a  href="http://meego.com/"; rel="external" itemprop="url" title="
 
 </div>
 
+<div class="clear"></div>
 
-<div class="grid_4" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<div class="grid_4 alpha" itemscope itemtype="http://data-vocabulary.org/Organization";>
 
 <p class="heading">
 <a  href="http://www.nokia.com/"; rel="external" itemprop="url" title="Nokia"><img src="{$baseUrl}/img/spnsrs-overview/nokia.png" alt="Nokia" id="nokia"/></a>
@@ -230,7 +236,7 @@ Learn more at <a href="http://www.opensuse.org/en/"; rel="external" itemprop="url
 
 </div>
 
-<div class="grid_4 omega" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<div class="grid_4" itemscope itemtype="http://data-vocabulary.org/Organization";>
 
 <p class="heading">
 <a href="http://www.redhat.com/"; rel="external" itemprop="url" title="redhat.com"><img src="{$baseUrl}/img/spnsrs-overview/redhat.png" alt="RedHat" id="redhat"/></a>
@@ -254,9 +260,7 @@ Learn more at <a href="http://www.redhat.com/"; rel="external" itemprop="url" tit
 
 </div>
 
-<div class="clear"></div>
-
-<div class="grid_4 alpha" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<div class="grid_4 omega" itemscope itemtype="http://data-vocabulary.org/Organization";>
 
 <p class="heading">
 <a href="http://www.ubuntu-user.com/"; rel="external" itemprop="url" title="Ubuntu User (English)"><img src="{$baseUrl}/img/spnsrs-overview/ubuntu-user.png" alt="Ubuntu User" id="ubuntu-user"/></a>
@@ -270,9 +274,21 @@ Learn more at <a href="http://www.redhat.com/"; rel="external" itemprop="url" tit
 
 </div>
 
+<div class="clear"></div>
+
 {* Bronze sponsors *}
 
-<div class="grid_4" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<div class="grid_4 alpha">
+<h4>Bronze sponsors</h4>
+</div>
+
+<div class="grid_4">&nbsp;</div>
+<div class="grid_4">&nbsp;</div>
+<div class="grid_4 omega">&nbsp;</div>
+
+<div class="clear"></div>
+
+<div class="grid_4 alpha" itemscope itemtype="http://data-vocabulary.org/Organization";>
 
 <p class="heading">
 <a href="http://www.arm.com/"; rel="external" itemprop="url" title="ARM"><img src="{$baseUrl}/img/spnsrs-overview/arm.png" alt="ARM" id="arm"/></a></p>
@@ -292,24 +308,20 @@ Learn more at <a href="http://www.arm.com/"; itemprop="url" rel="external" title=
 <div class="grid_4" itemscope itemtype="http://data-vocabulary.org/Organization";>
 
 <p class="heading">
-<a href="http://www.openismus.com/"; rel="external" itemprop="url" title="Openismus"><img src="{$baseUrl}/img/spnsrs-overview/openismus.png" alt="Openismus" id="openismus"/></a>
-</p>
-
-<p>
-<span itemprop="name">Openismus</span> is the <span itemprop="address" itemscope itemtype="http://data-vocabulary.org/Address";><span itemprop="country-name">German</span> open-source consultancy. We provide expertise in C and C++ on Linux, using GTK+ and Qt. Our senior developers in <span itemprop="locality">Berlin</span></span> are valued team members with reputations earned in open source projects.
+<a href="http://hxxfoundation.nl/"; rel="external" itemprop="url" title="Hxx Foundation"><img src="{$baseUrl}/img/spnsrs-overview/hxx.png" alt="Hxx" id="hxx"/></a>
 </p>
 
 <p>
-We also train employees in-house, creating new developers who share our tradition of quality, focus, and clear communication.
+The goal of the <span itemprop="name">Hxx Foundation</span>: organisation of congresses, festivals and lectures in the field of or relating to computertechnology and society, as well as anything that is directly or indirectly relating or conducive to aforementioned intentions, all in the broadest sense possible.
 </p>
 
 <p>
-Learn more at <a href="http://www.openismus.com/"; rel="external" itemprop="url" title="Openismus">www.openismus.com</a>.
+Learn more at <a href="http://hxxfoundation.nl/"; rel="external" itemprop="url" title="Hxx Foundation">hxxfoundation.nl</a>.
 </p>
 
 </div> 
 
-<div class="grid_4 omega" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<div class="grid_4" itemscope itemtype="http://data-vocabulary.org/Organization";>
 
 <p class="heading">
 <a  href="http://www.mozilla.org/"; rel="external" itemprop="url" title="Mozilla.org"><img src="{$baseUrl}/img/spnsrs-overview/mozilla.png" alt="Mozilla" id="mozilla"/></a>
@@ -324,6 +336,33 @@ Learn more at <a  href="http://www.mozilla.org/"; rel="external" title="Mozilla.o
 
 </div>
 
+<div class="grid_4 omega" itemscope itemtype="http://data-vocabulary.org/Organization";>
+
+<p class="heading">
+<a href="http://www.openismus.com/"; rel="external" itemprop="url" title="Openismus"><img src="{$baseUrl}/img/spnsrs-overview/openismus.png" alt="Openismus" id="openismus"/></a>
+</p>
+
+<p>
+<span itemprop="name">Openismus</span> is the <span itemprop="address" itemscope itemtype="http://data-vocabulary.org/Address";><span itemprop="country-name">German</span> open-source consultancy. We provide expertise in C and C++ on Linux, using GTK+ and Qt. Our senior developers in <span itemprop="locality">Berlin</span></span> are valued team members with reputations earned in open source projects.
+</p>
+
+<p>
+We also train employees in-house, creating new developers who share our tradition of quality, focus, and clear communication.
+</p>
+
+<p>
+Learn more at <a href="http://www.openismus.com/"; rel="external" itemprop="url" title="Openismus">www.openismus.com</a>.
+</p>
+
+</div> 
+
+<div class="clear"></div>
+
+<div class="grid_4 alpha"><h4>National sponsors</h4></div>
+<div class="grid_4">&nbsp;</div>
+<div class="grid_4"><h4>Silver sponsors</h4></div>
+<div class="grid_4 omega">&nbsp;</div>
+
 <div class="clear"></div>
 
 <div class="grid_4 alpha" itemscope itemtype="http://data-vocabulary.org/Organization";>
@@ -350,14 +389,99 @@ Learn more at <a lang="en-GB" href="http://www.nlnet.nl/"; rel="external" title="
 
 </div>
 
-<div class="grid_4 omega" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<div class="grid_4" itemscope itemtype="http://data-vocabulary.org/Organization";>
 
 <p class="heading">
 <a lang="nl-NL" href="http://www.ictivity.nl/"; rel="external" itemprop="url" title="Ictivity"><img src="{$baseUrl}/img/spnsrs-overview/ictivity.png" alt="Ictivity" id="ictivity"/></a>
 </p>
 
 <p>
-Learn more at <a lang="nl-NL" href="http://www.ictivity.nl/"; rel="external" title="Ictivity">http://www.ictivity.nl/</a> (Dutch).
+Learn more at <a lang="nl-NL" href="http://www.ictivity.nl/"; rel="external" title="Ictivity">www.ictivity.nl</a> (Dutch).
+</p>
+
+</div>
+
+<div class="grid_4" itemscope itemtype="http://data-vocabulary.org/Organization";>
+
+<p class="heading">
+<a lang="en-GB" href="http://www.fluendo.com/"; rel="external" itemprop="url" title="Fluendo"><img src="{$baseUrl}/img/spnsrs-overview/fluendo.png" alt="Fluendo" id="fluendo"/></a>
+</p>
+
+<p>
+<strong>Fluendo and Flumotion provide the video streaming during the main conference.</strong>
+</p>
+
+<p>
+Founded in 2004 in Barcelona, <span itemprop="name">Fluendo</span> specializes in software development and consulting services. Fluendo employs several of the central developers of GStreamer, an Open Source framework which is quickly establishing itself as the de-facto standard multimedia framework for GNU/Linux and UNIX systems.
+</p>
+
+<p>
+Fluendo provides a wide range of products under and above GStreamer, including proprietary codecs (together with their respective patent licenses), a streaming server, Fluendo DVD Player, Fluendo Media Center, and Moovida Pro Media Player for Windows.
+</p>
+
+<p>
+Fluendo develops multimedia software to offer cross-platform and open source-based multimedia solutions to computer devices and consumer electronics, always aiming at proposing an innovative perspective of entertainment.
+</p>
+
+<p>
+Fluendo is one of three companies in the Fluendo Group, and was the first one to be created. Fluendo is the pioneer company of the group gathering GStreamer expertise, and also holding the basis of all the solutions offered by the other two companies: Flumotion Services S.A. and Fluendo Embedded S.L.
+</p>
+
+<p>
+Learn more at <a lang="en-GB" href="http://www.fluendo.com/"; rel="external" title="Fluendo">www.fluendo.com</a>.
+</p>
+
+</div>
+
+<div class="grid_4 omega" itemscope itemtype="http://data-vocabulary.org/Organization";>
+
+<p class="heading">
+<a lang="en-GB" href="http://www.flumotion.net/"; rel="external" itemprop="url" title="Flumotion"><img src="{$baseUrl}/img/spnsrs-overview/flumotion.png" alt="Flumotion" id="flumotion"/></a>
+</p>
+
+<p>
+<strong>Flumotion and Fluendo provide the video streaming during the main conference.</strong>
+</p>
+
+<p>
+<span itemprop="name">Flumotion</span> offers multi-format streaming solutions for the delivery of audio and video services over the Internet. Started in 2006 by a group of open source developers and multimedia experts as a Free Software project, Flumotion combines an innovative open source software package with GStreamer.
+</p>
+
+<p>
+Thanks to its flexible and distributed design and its choice of Python as the high-level language for development, it is now the worldâ??s easiest and most powerful streaming software and platform for open streaming. Flumotion's end-to-end technology covers the entire streaming value chain and enables streaming in open as well as proprietary formats. Live and on-demand streaming for new formats and devices is integrated in record time such as WebM, iPad and Android. 
+</p>
+
+<p>
+Learn more at <a lang="en-GB" href="http://www.flumotion.net/"; rel="external" title="Ictivity">www.flumotion.net</a>.
+</p>
+
+</div>
+
+<div class="clear"></div>
+
+<div class="grid_4 alpha omega">
+<h4>Media partner</h4>
+</div>
+<div class="grid_4">&nbsp;</div>
+<div class="grid_4">&nbsp;</div>
+<div class="grid_4 omega">&nbsp;</div>
+
+<div class="clear"></div>
+
+<div class="grid_4 alpha omega" itemscope itemtype="http://data-vocabulary.org/Organization";>
+
+<p class="heading">
+<a href="http://www.linux-magazine.com/"; rel="external" itemprop="url" title="Linux Magazine Online (English)"><img src="{$baseUrl}/img/spnsrs-overview/linux-magazine.png" alt="Linux Magazine" id="linux-magazine"/></a>
+</p>
+<p>
+<span itemprop="name">Linux Magazine</span> is a monthly magazine serving readers in over 50 countries.
+</p>
+<p>
+<abbr title="GNOME Users&#146; And Developers&#146; European Conference">GUADEC</abbr> 2010 is sponsored by Linux Magazine
+    <a href="http://www.linux-magazine.com/"; rel="external" itemprop="url" title="Linux Magazine Online (UK/International)">International</a>,
+    <a lang="de-DE" href="http://www.linux-magazin.de/"; rel="external" itemprop="url" title="Linux-Magazin Online (Deutschland)">Germany</a>,
+    <a lang="pl-PL" href="http://www.linux-magazine.pl/"; rel="external" itemprop="url" title="Linux Magazine (Polska)">Poland</a> and
+    <a lang="es-ES" href="http://www.linux-magazine.es/"; rel="external" itemprop="url" title="Linux Magazine (EspaÃ±a)">Spain</a>.
 </p>
 
 </div>
diff --git a/templates/streams/index.tpl b/templates/streams/index.tpl
new file mode 100644
index 0000000..c5e7e6c
--- /dev/null
+++ b/templates/streams/index.tpl
@@ -0,0 +1,38 @@
+{**
+ * index.tpl
+ *
+ * Copyright (c) 2000-2009 John Willinsky
+ * Copyright (c) 2010 Sense Hofstede <sense ubuntu com>
+ * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+ *
+ * Conference index page. Displayed when a conference, but not a scheduled
+ * conference, has been selected.
+ *
+ * $Id: index.tpl,v 1.19.2.1 2009/04/08 20:45:51 asmecher Exp $
+ *}
+{assign var="pageTitleTranslated" value=$pageTitle}
+{assign var="hideTitle" value="true"}
+{include file="common/header.tpl"}
+
+<div id="streams">
+
+    <div id="streamlist">
+        <p>
+            <div class="a_stream">
+                <a href="{url conference="guadec" schedConf="2010" page="streams" op="stream"}?number=1" title="Watch video live stream">Video Stream 'Paris'</a>
+                <br/><em style="font-size: 8pt;">http://live1.guadec.stream.flumotion.com/guadec/live1.webm.m3u</em>
+            </div>
+            <div class="a_stream">            
+                <a href="{url conference="guadec" schedConf="2010" page="streams" op="stream"}?number=2" title="Watch video live stream">Video Stream 'Copenhagen'</a>
+                <br/><em style="font-size: 8pt;">http://live2.guadec.stream.flumotion.com/guadec/live2.webm.m3u</em>
+            </div>
+            <div class="a_stream">            
+                <a href="{url conference="guadec" schedConf="2010" page="streams" op="stream"}?number=3" title="Watch video live stream">Video Stream 'Seville'</a>
+                <br/><em style="font-size: 8pt;">http://live3.guadec.stream.flumotion.com/guadec/live3.webm.m3u</em>
+            </div>
+        </p>
+    </div>
+
+</div>
+
+{include file="common/footer.tpl"}
diff --git a/templates/streams/stream.tpl b/templates/streams/stream.tpl
new file mode 100644
index 0000000..51ed9f0
--- /dev/null
+++ b/templates/streams/stream.tpl
@@ -0,0 +1,35 @@
+{**
+ * stream.tpl
+ *
+ * Copyright (c) 2000-2009 John Willinsky
+ * Copyright (c) 2010 Sense Hofstede <sense ubuntu com>
+ * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+ *
+ * Conference index page. Displayed when a conference, but not a scheduled
+ * conference, has been selected.
+ *
+ * $Id: index.tpl,v 1.19.2.1 2009/04/08 20:45:51 asmecher Exp $
+ *}
+{assign var="pageTitleTranslated" value=$pageTitle}
+{assign var="hideTitle" value="true"}
+{include file="common/header.tpl"}
+
+<div id="streamview">
+    <div>
+        <p style="float: left; ">
+            <em>{$streamList}</em>
+        </p>
+        <p style="float: right;">
+            <em style="font-size: 10pt;"><a rel="external" href="http://live.gnome.org/WebM"; title="Information for playing WebM streams on your system">WebM support</a></em>
+        </p>
+    </div>
+
+    <div class="clear"></div>
+
+    <div class="videoplayer">
+        <video width="560" height="340" autoplay="autoplay" controls="controls" type="video/webm" src="{$streamUrl}">Please try to open <a href="{$streamurl}" title="WebM Live Stream {$streamNumber} by Flumotion">{$streamurl}</a> in a WebM-capable video player, since you're browser doesn't seem to support the HTML5 video tag.</video>
+    </div><br/ >
+    <a href="http://www.flumotion.com/webm";><img src="{$baseUrl}/img/flumotion_banner.png" width="560" height="66" border="0" alt="WebM Live Streaming by Flumotion" title="WebM Live Streaming by Flumotion"/></a>
+</div>
+
+{include file="common/footer.tpl"}
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]