GNOME.org
 

[guadec-web/2010: 1/6] [frontpage] [sponsors] [TGOOD] New sponsors' page, several new sponsors, video Neelie Kroes on front

commit 25e3edcff0896b3cd2ac625585649fbf1d7a48c5
Author: Sense Hofstede <qense ubuntu com>
Date:   Sat Jul 17 14:07:09 2010 +0200

    [frontpage] [sponsors] [TGOOD] New sponsors' page, several new sponsors, video Neelie Kroes on front page
    
     * A new page was created with a description of all sponsors. The sponsor list on the front page now links to this
     * New sponsors added, img/COPYRIGHT was updated accordingly:
         - Collabora
         - Google
         - Igalia
         - Intel
         - MeeGo
         - Mozilla
         - Nokia
         - Openismus
         - RedHat
     * PNG logos, replaced JPG and GIF images, for:
         - ARM
         - Canonical
         - The Linux Foundation
         - Linux Magazine
         - openSUSE
     * New GNOME Open Desktop Day sponsor: the Linux Professional Institute
     * Front page changes:
         - Embed Neelie Kroes' GUADEC video from YouTube
         - Updates to the display of the sponsors
         - Added a link to information about GNOME developer training
         - Added a 'More Information...' under the conference introduction, linking to the conference overview
         - Relocated the 'Register Now' button to a more visible and sensible place
     * Several text updates to the GNOME Open Desktop Day information page
     * Added a link to the registration page in the header
     * Updated background colours of some cells in the schedule table
     * Editing the DOAP file to make it work with the new repository

 css/index.css                                  |   11 +-
 guadec-web.doap => guadec2010-web.doap         |    5 +-
 img/COPYING                                    |    7 +-
 img/spnsrs-overview/arm.png                    |  Bin 0 -> 7253 bytes
 img/spnsrs-overview/canonical.png              |  Bin 0 -> 4400 bytes
 img/spnsrs-overview/collabora.png              |  Bin 0 -> 4936 bytes
 img/spnsrs-overview/google.png                 |  Bin 0 -> 9186 bytes
 img/spnsrs-overview/igalia.png                 |  Bin 0 -> 6912 bytes
 img/spnsrs-overview/intel.png                  |  Bin 0 -> 10325 bytes
 img/spnsrs-overview/lanedo.png                 |  Bin 0 -> 4582 bytes
 img/spnsrs-overview/linux-foundation.png       |  Bin 0 -> 2926 bytes
 img/spnsrs-overview/linux-magazine.png         |  Bin 0 -> 2211 bytes
 img/spnsrs-overview/meego.png                  |  Bin 0 -> 6230 bytes
 img/spnsrs-overview/mozilla.png                |  Bin 0 -> 4103 bytes
 img/spnsrs-overview/nokia.png                  |  Bin 0 -> 2298 bytes
 img/spnsrs-overview/openismus.png              |  Bin 0 -> 5424 bytes
 img/spnsrs-overview/opensuse.png               |  Bin 0 -> 11604 bytes
 img/spnsrs-overview/redhat.png                 |  Bin 0 -> 10627 bytes
 img/spnsrs-overview/ubuntu-user.png            |  Bin 0 -> 10394 bytes
 img/spnsrs/arm.jpg                             |  Bin 12443 -> 0 bytes
 img/spnsrs/arm.png                             |  Bin 0 -> 8157 bytes
 img/spnsrs/canonical.jpg                       |  Bin 1281 -> 0 bytes
 img/spnsrs/canonical.png                       |  Bin 0 -> 3671 bytes
 img/spnsrs/collabora.png                       |  Bin 0 -> 5116 bytes
 img/spnsrs/google.png                          |  Bin 0 -> 10132 bytes
 img/spnsrs/igalia.png                          |  Bin 0 -> 7704 bytes
 img/spnsrs/intel.png                           |  Bin 0 -> 10325 bytes
 img/spnsrs/lanedo.png                          |  Bin 0 -> 4829 bytes
 img/spnsrs/linux-foundation.png                |  Bin 0 -> 3011 bytes
 img/spnsrs/linux-magazine.png                  |  Bin 0 -> 2168 bytes
 img/spnsrs/linuxfoundation.jpg                 |  Bin 2061 -> 0 bytes
 img/spnsrs/linuxmagazine.gif                   |  Bin 2847 -> 0 bytes
 img/spnsrs/meego.png                           |  Bin 0 -> 7438 bytes
 img/spnsrs/mozilla.png                         |  Bin 0 -> 4502 bytes
 img/spnsrs/nokia.png                           |  Bin 0 -> 2290 bytes
 img/spnsrs/openismus.png                       |  Bin 0 -> 5508 bytes
 img/spnsrs/opensuse.jpg                        |  Bin 6006 -> 0 bytes
 img/spnsrs/opensuse.png                        |  Bin 0 -> 13451 bytes
 img/spnsrs/redhat.png                          |  Bin 0 -> 11302 bytes
 img/spnsrs/{ubuntuuser.png => ubuntu-user.png} |  Bin 10816 -> 10816 bytes
 img/tgood-spnsrs/lpi.png                       |  Bin 0 -> 6343 bytes
 pages/schedConf/SchedConfHandler.inc.php       |   12 +
 styles/schedule.css                            |    4 +-
 styles/sponsors.css                            |   14 +
 templates/common/header.tpl                    |    1 +
 templates/conference/index.tpl                 |  153 ++++++++----
 templates/schedConf/index.tpl                  |    1 +
 templates/schedConf/opendesktopday.tpl         |   91 +++----
 templates/schedConf/sponsors.tpl               |  336 ++++++++++++++++++++++++
 49 files changed, 526 insertions(+), 109 deletions(-)
---
diff --git a/css/index.css b/css/index.css
index 0488c11..2314cb4 100644
--- a/css/index.css
+++ b/css/index.css
@@ -2,7 +2,7 @@
  ******************************************************************************/
 
 #content h2.flickr {
-    margin-top: 30px;
+    margin-top: 20px;
     border-bottom: 1px solid #ccc;
     line-height: 30px;
     font-size: 16px;
@@ -14,8 +14,11 @@
 
 .flickrPhotos {
     overflow: hidden;
-    margin-right: -2px;
-    margin-bottom: 40px;
+    padding-left: 2px;
+    margin-left: auto;
+    margin-right: auto;
+    width: 233px;
+    /*margin-bottom: 40px;*/
 }
 .flickrPhotos a {
     display: block;
@@ -24,7 +27,7 @@
 .flickrPhotos a img {
     margin-right: 2px;
     margin-bottom: 2px;
-    paddding: 3px;
+    /*padding: 3px;*/
     display: block;
     width: 75px;
     height: 75px;
diff --git a/guadec-web.doap b/guadec2010-web.doap
similarity index 70%
rename from guadec-web.doap
rename to guadec2010-web.doap
index 592aff3..83ef25c 100644
--- a/guadec-web.doap
+++ b/guadec2010-web.doap
@@ -4,8 +4,9 @@
          xmlns:gnome="http://api.gnome.org/doap-extensions#";
          xmlns="http://usefulinc.com/ns/doap#";>
 
-  <name xml:lang="en">guadec-web</name>
-  <shortdesc xml:lang="en">The GUADEC website, using Open Conference Systems</shortdesc>
+  <name xml:lang="en">guadec2010-web</name>
+  <shortdesc xml:lang="en">The GUADEC 2010 website, using 'Open Conference Systems'</shortdesc>
+  <shortdesc xml:lang="nl">De GUADEC 2010 website, gebruik makend van 'Open Conference Systems'</shortdesc>
   <homepage rdf:resource="http://guadec.org/"; />
   <category rdf:resource="http://api.gnome.org/doap-extensions#infrastructure"; />
 
diff --git a/img/COPYING b/img/COPYING
index d64725d..0f10a72 100644
--- a/img/COPYING
+++ b/img/COPYING
@@ -1,4 +1,5 @@
-'arjen-kamphuis.jpg' is from an unknown source (BUG)
 'guadec-oranje.png' was created by ÐÐÐÐÐÐ ÐÐÐÐÐ <http://danilo.segan.org/>
-'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.
+
+
+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>
diff --git a/img/spnsrs-overview/arm.png b/img/spnsrs-overview/arm.png
new file mode 100644
index 0000000..56af720
Binary files /dev/null and b/img/spnsrs-overview/arm.png differ
diff --git a/img/spnsrs-overview/canonical.png b/img/spnsrs-overview/canonical.png
new file mode 100644
index 0000000..5b13607
Binary files /dev/null and b/img/spnsrs-overview/canonical.png differ
diff --git a/img/spnsrs-overview/collabora.png b/img/spnsrs-overview/collabora.png
new file mode 100644
index 0000000..f201027
Binary files /dev/null and b/img/spnsrs-overview/collabora.png differ
diff --git a/img/spnsrs-overview/google.png b/img/spnsrs-overview/google.png
new file mode 100644
index 0000000..ae84cc2
Binary files /dev/null and b/img/spnsrs-overview/google.png differ
diff --git a/img/spnsrs-overview/igalia.png b/img/spnsrs-overview/igalia.png
new file mode 100644
index 0000000..8f0dcbd
Binary files /dev/null and b/img/spnsrs-overview/igalia.png differ
diff --git a/img/spnsrs-overview/intel.png b/img/spnsrs-overview/intel.png
new file mode 100644
index 0000000..b956fc0
Binary files /dev/null and b/img/spnsrs-overview/intel.png differ
diff --git a/img/spnsrs-overview/lanedo.png b/img/spnsrs-overview/lanedo.png
new file mode 100644
index 0000000..b7465a6
Binary files /dev/null and b/img/spnsrs-overview/lanedo.png differ
diff --git a/img/spnsrs-overview/linux-foundation.png b/img/spnsrs-overview/linux-foundation.png
new file mode 100644
index 0000000..87f9433
Binary files /dev/null and b/img/spnsrs-overview/linux-foundation.png differ
diff --git a/img/spnsrs-overview/linux-magazine.png b/img/spnsrs-overview/linux-magazine.png
new file mode 100644
index 0000000..fca636e
Binary files /dev/null and b/img/spnsrs-overview/linux-magazine.png differ
diff --git a/img/spnsrs-overview/meego.png b/img/spnsrs-overview/meego.png
new file mode 100644
index 0000000..f77b48c
Binary files /dev/null and b/img/spnsrs-overview/meego.png differ
diff --git a/img/spnsrs-overview/mozilla.png b/img/spnsrs-overview/mozilla.png
new file mode 100644
index 0000000..f85ef85
Binary files /dev/null and b/img/spnsrs-overview/mozilla.png differ
diff --git a/img/spnsrs-overview/nokia.png b/img/spnsrs-overview/nokia.png
new file mode 100644
index 0000000..7ae9837
Binary files /dev/null and b/img/spnsrs-overview/nokia.png differ
diff --git a/img/spnsrs-overview/openismus.png b/img/spnsrs-overview/openismus.png
new file mode 100644
index 0000000..25690d8
Binary files /dev/null and b/img/spnsrs-overview/openismus.png differ
diff --git a/img/spnsrs-overview/opensuse.png b/img/spnsrs-overview/opensuse.png
new file mode 100644
index 0000000..84cca65
Binary files /dev/null and b/img/spnsrs-overview/opensuse.png differ
diff --git a/img/spnsrs-overview/redhat.png b/img/spnsrs-overview/redhat.png
new file mode 100644
index 0000000..0f83337
Binary files /dev/null and b/img/spnsrs-overview/redhat.png differ
diff --git a/img/spnsrs-overview/ubuntu-user.png b/img/spnsrs-overview/ubuntu-user.png
new file mode 100644
index 0000000..bc6ea5b
Binary files /dev/null and b/img/spnsrs-overview/ubuntu-user.png differ
diff --git a/img/spnsrs/arm.png b/img/spnsrs/arm.png
new file mode 100644
index 0000000..3646d45
Binary files /dev/null and b/img/spnsrs/arm.png differ
diff --git a/img/spnsrs/canonical.png b/img/spnsrs/canonical.png
new file mode 100644
index 0000000..75bd866
Binary files /dev/null and b/img/spnsrs/canonical.png differ
diff --git a/img/spnsrs/collabora.png b/img/spnsrs/collabora.png
new file mode 100644
index 0000000..7a38408
Binary files /dev/null and b/img/spnsrs/collabora.png differ
diff --git a/img/spnsrs/google.png b/img/spnsrs/google.png
new file mode 100644
index 0000000..8d482b7
Binary files /dev/null and b/img/spnsrs/google.png differ
diff --git a/img/spnsrs/igalia.png b/img/spnsrs/igalia.png
new file mode 100644
index 0000000..f172086
Binary files /dev/null and b/img/spnsrs/igalia.png differ
diff --git a/img/spnsrs/intel.png b/img/spnsrs/intel.png
new file mode 100644
index 0000000..b956fc0
Binary files /dev/null and b/img/spnsrs/intel.png differ
diff --git a/img/spnsrs/lanedo.png b/img/spnsrs/lanedo.png
new file mode 100644
index 0000000..fee40af
Binary files /dev/null and b/img/spnsrs/lanedo.png differ
diff --git a/img/spnsrs/linux-foundation.png b/img/spnsrs/linux-foundation.png
new file mode 100644
index 0000000..844aaa5
Binary files /dev/null and b/img/spnsrs/linux-foundation.png differ
diff --git a/img/spnsrs/linux-magazine.png b/img/spnsrs/linux-magazine.png
new file mode 100644
index 0000000..a051193
Binary files /dev/null and b/img/spnsrs/linux-magazine.png differ
diff --git a/img/spnsrs/meego.png b/img/spnsrs/meego.png
new file mode 100644
index 0000000..351d41f
Binary files /dev/null and b/img/spnsrs/meego.png differ
diff --git a/img/spnsrs/mozilla.png b/img/spnsrs/mozilla.png
new file mode 100644
index 0000000..c10b8ea
Binary files /dev/null and b/img/spnsrs/mozilla.png differ
diff --git a/img/spnsrs/nokia.png b/img/spnsrs/nokia.png
new file mode 100644
index 0000000..0d22dc8
Binary files /dev/null and b/img/spnsrs/nokia.png differ
diff --git a/img/spnsrs/openismus.png b/img/spnsrs/openismus.png
new file mode 100644
index 0000000..d69dd42
Binary files /dev/null and b/img/spnsrs/openismus.png differ
diff --git a/img/spnsrs/opensuse.png b/img/spnsrs/opensuse.png
new file mode 100644
index 0000000..4d43f93
Binary files /dev/null and b/img/spnsrs/opensuse.png differ
diff --git a/img/spnsrs/redhat.png b/img/spnsrs/redhat.png
new file mode 100644
index 0000000..66af4c9
Binary files /dev/null and b/img/spnsrs/redhat.png differ
diff --git a/img/spnsrs/ubuntuuser.png b/img/spnsrs/ubuntu-user.png
similarity index 100%
rename from img/spnsrs/ubuntuuser.png
rename to img/spnsrs/ubuntu-user.png
diff --git a/img/tgood-spnsrs/lpi.png b/img/tgood-spnsrs/lpi.png
new file mode 100644
index 0000000..6b88f1d
Binary files /dev/null and b/img/tgood-spnsrs/lpi.png differ
diff --git a/pages/schedConf/SchedConfHandler.inc.php b/pages/schedConf/SchedConfHandler.inc.php
index c259204..d7d9cce 100644
--- a/pages/schedConf/SchedConfHandler.inc.php
+++ b/pages/schedConf/SchedConfHandler.inc.php
@@ -509,6 +509,18 @@ class SchedConfHandler extends Handler {
 
 		$templateMgr->display('schedConf/opendesktopday.tpl');
 	}
+	
+		/**
+	 * Display a page with the list of sponsors.
+	 */
+	function sponsors($args) {
+		list($conference, $schedConf) = SchedConfHandler::validate(true, true);
+
+		$templateMgr = &TemplateManager::getManager();
+		$templateMgr->append('stylesheets', Request::getBaseUrl() . "/styles/sponsors.css");
+
+		$templateMgr->display('schedConf/sponsors.tpl');
+    }
 }
 
 ?>
diff --git a/styles/schedule.css b/styles/schedule.css
index 36f2f2b..469cc9c 100644
--- a/styles/schedule.css
+++ b/styles/schedule.css
@@ -43,7 +43,7 @@ td.orange {
     background-color: #FF950E;
 }
 td.green {
-    background-color: #23FF23;
+    background-color: #11730B;
 }
 td.blue {
     background-color: #00DCFF;
@@ -52,7 +52,7 @@ td.purple {
     background-color: #CCCCFF;
 }
 td.red {
-    background-color: #FF0000;
+    background-color: #9E152E;
 }
 td.yellow {
     background-color: #E6FF00;
diff --git a/styles/sponsors.css b/styles/sponsors.css
new file mode 100644
index 0000000..04b270d
--- /dev/null
+++ b/styles/sponsors.css
@@ -0,0 +1,14 @@
+/**
+ * sponsors.css
+ *
+ * Copyright (C) 2010 Sense Hofstede <qense ubuntu com>
+ * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
+ *
+ * Stylesheet for the sponsors' page.
+ *
+ */
+ 
+#sponsors img {
+    clear: both;
+    margin-bottom: 0.6em;
+}
diff --git a/templates/common/header.tpl b/templates/common/header.tpl
index ba2ca3f..ead20f0 100644
--- a/templates/common/header.tpl
+++ b/templates/common/header.tpl
@@ -98,6 +98,7 @@
 		        {/if}
 		        
 		        <li><a href="http://live.gnome.org/GUADEC/2010";>Wiki</a></li>
+		        <li><a href="https://register.guadec.org/";>Registration</a></li>
 		        
 		        {if $isUserLoggedIn}
 			        <li><a href="{url page="user"}">{translate key="navigation.userHome"}</a></li>
diff --git a/templates/conference/index.tpl b/templates/conference/index.tpl
index dd050d3..d8519c5 100644
--- a/templates/conference/index.tpl
+++ b/templates/conference/index.tpl
@@ -14,9 +14,14 @@
 {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>
 
-                <div class="grid_8 alpha">
-                    <h1>About GUADEC <a href="http://register.guadec.org/"; title="GUADEC 2010 registration"><img src="{$baseUrl}/img/register_now.png" style="float: right;" alt="Register Now"/></a></h1>
+                <div class="grid_6 alpha">
+                    <h1>About GUADEC</h1>
                     
                     <p class="feature">
                         GUADEC (pronounced <em>gwah-dec</em>) is the largest get together of GNOME users, developers, foundation leaders, individuals, governments and businesses in the world.
@@ -27,44 +32,73 @@
                     <p>These combine with many practical sessions and discussion groups which set the direction of the GNOME project. It also aims to attract new developers and contributors, as well has serve as a meeting point for corporate interests and allow us to showcase some of the latest technologies.</p>
                     
                     <p>In its <strong>11th consecutive year</strong>, GUADEC 2010 is being held in the <strong><a href="http://portal.hhs.nl/portal/page/portal/en";>The Hague University</a></strong>, in The Hague, Netherlands, from <strong>Monday 26th July, until Friday 30th July</strong>.</p>
-
-                </div>
-                
-                <div class="grid_8 omega">
-                    <h2 class="flickr">previous GNOME conferences around the globe on <span style="color: #3465a4;">Flick</span><span style="color: #ff048c;">r</span></h2>
                     
-                    <div class="flickrPhotos">
-                        <a href="http://www.flickr.com/photos/gpoo/3188692723/"; title="âEl panel de amor y odio a Gnomeâ by gpoo"><img src="http://farm4.static.flickr.com/3303/3188692723_5bb033a351_s.jpg"; alt="" /></a>
-                        <a href="http://www.flickr.com/photos/mariosp/4194972082/"; title="âWebKitGTK+ 2009 Hackfestâ by mariosp"><img src="http://farm5.static.flickr.com/4008/4194972082_d51c8653e3_s.jpg"; alt="" /></a>
-                        <a href="http://www.flickr.com/photos/lucbyhet/3687485143/"; title="âGCDS Opening Keynoteâ by lucbyhet"><img src="http://farm3.static.flickr.com/2617/3687485143_8e0a752c3e_s.jpg"; alt="" /></a>
-                        <a href="http://www.flickr.com/photos/mariosp/3701083442/"; title="âJoint Party on Sundayâ by mariosp"><img src="http://farm4.static.flickr.com/3514/3701083442_4612162d85_s.jpg"; alt="" /></a>
-                        <a href="http://www.flickr.com/photos/gpoo/3335859855/"; title="âKDE & GNOMEâ by gpoo"><img src="http://farm4.static.flickr.com/3542/3335859855_07eefa2615_s.jpg"; alt="" /></a>
-                        <a href="http://www.flickr.com/photos/penguincakes/2661153010/"; title="âicecream deathmatchâ by penguincakes"><img src="http://farm4.static.flickr.com/3196/2661153010_bc6fd4bc87_s.jpg"; alt="" /></a>
-                        <a href="http://www.flickr.com/photos/gpoo/3188658895/"; title="âAssistentesâ by gpoo"><img src="http://farm4.static.flickr.com/3511/3188658895_bf8b259a84_s.jpg"; alt="" /></a>
-                        <a href="http://www.flickr.com/photos/mariosp/3701067138/"; title="âExiting Alfredo Kraus auditoriumâ by mariosp"><img src="http://farm3.static.flickr.com/2604/3701067138_a44dab53ff_s.jpg"; alt="" /></a>
-                        <a href="http://www.flickr.com/photos/csaavedra/1177718793/"; title="âThe feet of the gnomesâ by csaavedra"><img src="http://farm2.static.flickr.com/1399/1177718793_a8cbad0934_s.jpg"; alt="" /></a>
-                        <a href="http://www.flickr.com/photos/gpoo/3188694885/"; title="âGNOMEâ by gpoo"><img src="http://farm4.static.flickr.com/3533/3188694885_fbd048c3d5_s.jpg"; alt="" /></a>
-                        <a href="http://www.flickr.com/photos/mariosp/3701081572/"; title="âSponsored by GNOMEâ by mariosp"><img src="http://farm4.static.flickr.com/3472/3701081572_40a83e429d_s.jpg"; alt="" /></a>
-                        <a href="http://www.flickr.com/photos/rossburton/2668456327/"; title="âAdvisory Board Meetingâ by Ross Burton"><img src="http://farm4.static.flickr.com/3061/2668456327_18278926e5_s.jpg"; alt="" /></a>
-                    </div>
+                    <p><a href="{url conference="guadec" schedConf="2010"}" title="GUADEC 2010"><em>More information...</em></a></p>
                     
-                    <h1>About GNOME</h1>
-                    <p><img src="{$baseUrl}/img/gnome-logo.png" alt="" 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.</p>
                 </div>
+                
+                <div class="grid_10 omega">
+                    <h2>Video message from Neelie Kroes</h2>
 
-                <div class="grid_16 alpha">
+                    <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>
+                        
+                    <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.
+                    </p>
+                            
+                </div>
+                
+                <div class="clear"></div>
+                
+                <div class="grid_6 alpha">
                     <h2>The GNOME Open Desktop Day</h2>
-                    <p>Prior to <abbr title="GNOME Users&#146; And Developers&#146; European Conference">GUADEC</abbr>, the GNOME Open Desktop Day will take place, which is in fact a preconference to GUADEC. The GNOME Open Desktop Day will be organized in association with <a href="https://noiv.nl/service/english/"; rel="external" title="Nederland Open in Verbinding  &raquo; English">Programme Office NOiV</a> &mdash; 'the Netherlands in Open Connection'.</p>
+                    <p>Prior to <abbr title="GNOME Users&#146; And Developers&#146; European Conference">GUADEC</abbr>, the GNOME Open Desktop Day will take place, which is in fact a preconference to GUADEC.</p>
+                    <p>The GNOME Open Desktop Day will be organized in association with <a href="https://noiv.nl/service/english/"; rel="external" title="Nederland Open in Verbinding  &raquo; English">Programme Office NOiV</a> &mdash; 'the Netherlands in Open Connection'.</p>
 
-                    <p><a href="{url conference="guadec" schedConf="2010" page="schedConf" op="opendesktopday"}" title="GUADEC 2010 Overview - The GNOME Open Desktop Day"><em>More information...</em></a></p>
+                    <p><a href="{url conference="guadec" schedConf="2010" page="schedConf" op="opendesktopday"}" title="The GNOME Open Desktop Day"><em>More information...</em></a></p>
                 </div>
                 
+                <div class="grid_5">
+                    <h2>GNOME Developer training</h2>
+                    <p>On 26 July and 27 July 2010, the first GNOME Developer Training sessions will be run as part of <abbr title="GNOME Users&#146; And Developers&#146; European Conference">GUADEC</abbr> 2010.</p>
+                    <p>The participants will be trained in developing on and for the GNOME desktop, and in working effectively with the community.</p>
+
+                    <p><a href="{url conference="guadec" schedConf="2010" page="schedConf" op="training"}" title="GUADEC 2010 GNOME Developer training"><em>More information...</em></a></p>
+                </div>
+                
+                <div class="grid_5 omega">
+                    <h2 class="flickr">previous GNOME conferences on <span style="color: #3465a4;">Flick</span><span style="color: #ff048c;">r</span></h2>
+                        
+                        <div class="flickrPhotos">
+                            <a href="http://www.flickr.com/photos/gpoo/3188692723/"; title="âEl panel de amor y odio a Gnomeâ by gpoo"><img src="http://farm4.static.flickr.com/3303/3188692723_5bb033a351_s.jpg"; alt="" /></a>
+                            <a href="http://www.flickr.com/photos/mariosp/4194972082/"; title="âWebKitGTK+ 2009 Hackfestâ by mariosp"><img src="http://farm5.static.flickr.com/4008/4194972082_d51c8653e3_s.jpg"; alt="" /></a>
+                            <a href="http://www.flickr.com/photos/lucbyhet/3687485143/"; title="âGCDS Opening Keynoteâ by lucbyhet"><img src="http://farm3.static.flickr.com/2617/3687485143_8e0a752c3e_s.jpg"; alt="" /></a>
+                            <a href="http://www.flickr.com/photos/mariosp/3701083442/"; title="âJoint Party on Sundayâ by mariosp"><img src="http://farm4.static.flickr.com/3514/3701083442_4612162d85_s.jpg"; alt="" /></a>
+                            {*<a href="http://www.flickr.com/photos/gpoo/3335859855/"; title="âKDE & GNOMEâ by gpoo"><img src="http://farm4.static.flickr.com/3542/3335859855_07eefa2615_s.jpg"; alt="" /></a>*}
+                            {*<a href="http://www.flickr.com/photos/penguincakes/2661153010/"; title="âicecream deathmatchâ by penguincakes"><img src="http://farm4.static.flickr.com/3196/2661153010_bc6fd4bc87_s.jpg"; alt="" /></a>*}
+                            {*<a href="http://www.flickr.com/photos/gpoo/3188658895/"; title="âAssistentesâ by gpoo"><img src="http://farm4.static.flickr.com/3511/3188658895_bf8b259a84_s.jpg"; alt="" /></a>*}
+                            <a href="http://www.flickr.com/photos/mariosp/3701067138/"; title="âExiting Alfredo Kraus auditoriumâ by mariosp"><img src="http://farm3.static.flickr.com/2604/3701067138_a44dab53ff_s.jpg"; alt="" /></a>
+                            {*<a href="http://www.flickr.com/photos/csaavedra/1177718793/"; title="âThe feet of the gnomesâ by csaavedra"><img src="http://farm2.static.flickr.com/1399/1177718793_a8cbad0934_s.jpg"; alt="" /></a>*}
+                            <a href="http://www.flickr.com/photos/gpoo/3188694885/"; title="âGNOMEâ by gpoo"><img src="http://farm4.static.flickr.com/3533/3188694885_fbd048c3d5_s.jpg"; alt="" /></a>
+                            {*<a href="http://www.flickr.com/photos/mariosp/3701081572/"; title="âSponsored by GNOMEâ by mariosp"><img src="http://farm4.static.flickr.com/3472/3701081572_40a83e429d_s.jpg"; alt="" /></a>*}
+                            {*<a href="http://www.flickr.com/photos/rossburton/2668456327/"; title="âAdvisory Board Meetingâ by Ross Burton"><img src="http://farm4.static.flickr.com/3061/2668456327_18278926e5_s.jpg"; alt="" /></a>*}
+                        </div>
+	            </div>
+                
                 <div class="clear"></div>
                 
                 
                 {*
                 
-                
                 Temporarily hiding four information blocks
                 
                 
@@ -120,37 +154,62 @@
 		<p><a href="{url page="announcement"}">{translate key="announcement.moreAnnouncements"}</a></p>
 	</div>
 	
-	<div class="grid_4 omega">
-	    <h3>Sponsors</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: inset 0 1px 5px #999; box-shadow: inset 0 1px 5px #999; margin-top: 20px; text-align: center; padding: 20px; line-height: 150%;">
-	        <p><a href="http://www.linux-magazine.com/"; rel="external" title="Linux Magazine Online (English)"><img src="{$baseUrl}/img/spnsrs/linuxmagazine.gif" alt="Linux Magazine"/></a>
-	        <br/>
-	        <a href="http://www.linux-magazine.com/"; rel="external" title="Linux Magazine Online (UK/International)">International</a>,
-	        <a lang="de-DE" href="http://www.linux-magazin.de/"; rel="external" title="Linux-Magazin Online (Deutschland)">Germany</a>,
-	        <a lang="pl-PL" href="http://www.linux-magazine.pl/"; rel="external" title="Linux Magazine (Polska)">Poland</a>,
-            <a lang="es-ES" href="http://www.linux-magazine.es/"; rel="external" title="Linux Magazine (EspaÃa)">Spain</a>
+    <div class="grid_4 omega">
+        <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 *}
+            <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>
             <p>
-            <a href="http://www.ubuntu-user.com/"; rel="external" title="Ubuntu User (English)"><img src="{$baseUrl}/img/spnsrs/ubuntuuser.png" alt="Ubuntu User"/></a>
-            <br/>
-            <a href="http://www.ubuntu-user.com/"; rel="external" title="Ubuntu User (United States)">United States</a>,
-            <a lang="de-DE" href="http://www.ubuntu-user.de/"; rel="external" title="Ubuntu User (Deutschland)">Germany</a>
+            <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="collabora"}" title="Collabora"><img src="{$baseUrl}/img/spnsrs/collabora.png" alt="Collabora"/></a>
             </p>
             <p>
-            <a lang="en-GB" href="http://www.canonical.com/"; rel="external" title="Canonical"><img src="{$baseUrl}/img/spnsrs/canonical.jpg" alt="Canonical"/></a>
+            <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="google"}" title="Google"><img src="{$baseUrl}/img/spnsrs/google.png" alt="Google"/></a>
             </p>
             <p>
-            <a href="http://www.opensuse.org/en/"; rel="external" title="openSUSE.org"><img src="{$baseUrl}/img/spnsrs/opensuse.jpg" alt="openSUSE"/></a>
+            <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="igalia"}" title="Igalia"><img src="{$baseUrl}/img/spnsrs/igalia.png" alt="Igalia"/></a>
             </p>
             <p>
-            <a href="http://www.linuxfoundation.org/"; rel="external" title="The Linux Foundation"><img src="{$baseUrl}/img/spnsrs/linuxfoundation.jpg" alt="The Linux Foundation"/></a>
+            <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="intel"}" title="Intel"><img src="{$baseUrl}/img/spnsrs/intel.png" alt="Intel"/></a>
             </p>
             <p>
-            <a href="http://www.arm.com/"; rel="external" title="ARM"><img src="{$baseUrl}/img/spnsrs/arm.jpg" alt="ARM"/></a>
+            <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="lanedo"}" title="Lanedo"><img src="{$baseUrl}/img/spnsrs/lanedo.png" alt="Lanedo"/></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>
+            <p>
+            <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>
+            <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="nokia"}" title="Nokia"><img src="{$baseUrl}/img/spnsrs/nokia.png" alt="Nokia"/></a>
+            </p>
+            <p>
+            <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="opensuse"}" title="openSUSE.org"><img src="{$baseUrl}/img/spnsrs/opensuse.png" alt="openSUSE"/></a>
+            </p>
+            <p>
+            <a href="{url conference="guadec" schedConf="2010" page="schedConf" op="sponsors" anchor="redhat"}" title="RedHat"><img src="{$baseUrl}/img/spnsrs/redhat.png" alt="RedHat"/></a>
+            </p>
+            <p>
+            <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 *}
+            <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>
+            </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>
+            {*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>
 	
 	<div class="clear"></div>
 {/if}
diff --git a/templates/schedConf/index.tpl b/templates/schedConf/index.tpl
index 4c03191..4570ed3 100644
--- a/templates/schedConf/index.tpl
+++ b/templates/schedConf/index.tpl
@@ -64,6 +64,7 @@
 	    {if $schedConfPostAccommodation}<li><a href="{url page="schedConf" op="accommodation"}">{translate key="schedConf.accommodation"}</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>
     </ul>
     {/if}
     
diff --git a/templates/schedConf/opendesktopday.tpl b/templates/schedConf/opendesktopday.tpl
index 6a64eac..83cc212 100644
--- a/templates/schedConf/opendesktopday.tpl
+++ b/templates/schedConf/opendesktopday.tpl
@@ -12,26 +12,20 @@
 {include file="common/header.tpl"}
 {assign var="helpTopicId" value="user.conferenceInformation"}
                 <div class="grid_11 alpha">
-                    <p>
-                    With the upcoming release of GNOME 3.0, it will be no surprise that a lot of attention will be focused on the latest release issues. But there will also be special interest for the open source desktop in education and the government.
-                    </p>
-                    <p>
-                    Prior to <abbr title="GNOME Users&#146; And Developers&#146; European Conference">GUADEC</abbr>, the GNOME Open Desktop Day will take place, which is in fact a preconference to GUADEC. The GNOME Open Desktop Day will be organized in association with <a href="https://noiv.nl/service/english/"; rel="external" title="Nederland Open in Verbinding  &raquo; English">Programme Office NOiV</a> &mdash; 'the Netherlands in Open Connection'. In line with <a href="https://noiv.nl/files/2009/12/Action_plan_english.pdf"; rel="external" title="NOiV action plan (English)">their action plan</a>, the preconference will focus on the 'New Forerunners' <em>(action line 9, page 19 of the action plan)</em>.
+                    
+<h2>GUADEC pre-conference: July 26</h2>
+<p>
+                    With the upcoming release of <a href="http://live.gnome.org/ThreePointZero";>GNOME 3.0</a>, software development interests will focus increasingly on improved user experience, accessibility and application use. While the GUADEC 2010 conference aims to promote all of these ideals through the work of the GNOME Foundation, the GNOME Open Desktop Day will place important attention on the desktop in government and education.
                     </p>
-
-                    <p>This means that some of Europe&#146;s most interesting 'early adopters' of free or open source software on desktops in government organizations are invited to share their experiences. Some of these projects are:</p>
-                    <ul style="clear: left;">
-                        <li><a href="http://www.gvpontis.gva.es/fileadmin/conselleria/images/Documentacion/memoria/gvpontis_ingles.pdf"; rel="external" title="Report of the Valencian Regional Ministry of Infrastructure and Transport on their migration to open source">The GVPontis project</a> (Valencia, Spain)</li>
-                        <li><a href="http://www.wollmux.org/"; rel="external" title="WollMux">The Wollmux projecy</a> (Munich, Germany)</li>
-                    </ul
-
                     <p>
-                    What is perhaps most striking about these projects is the synergy that they have created, as they involve close collaboration of government institutions, software communities and businesses. During The GNOME Open Desktop Day, the pursued strategies and background of some of the most interesting projects in Europe will be discussed.
+                    The GNOME Open Desktop Day is a preconference to <abbr title="GNOME Users&#146; And Developers&#146; European Conference">GUADEC</abbr> 2010. It is organized in association with <a href="https://noiv.nl/service/english/"; rel="external" title="Nederland Open in Verbinding  &raquo; English">Programme Office NOiV</a> &mdash; 'the Netherlands in Open Connection' &mdash; and <a href="https://wiki.noiv.nl/xwiki/bin/view/OpenDWR/";>Open DWR</a>. In line with <a href="https://noiv.nl/files/2009/12/Action_plan_english.pdf"; rel="external" title="NOiV action plan (English)">the NOiV's action plan</a>, the preconference will focus on the 'New Forerunners' <em>(action line 9, page 19 of the action plan)</em> and other organisations in the public/private sectors interested in open desktop development. <p>
+Interesting open desktop software 'early adopter' projects will share their experiences collaborating with governmental institutions, software communities and businesses. In presentations and interactive sessions, there's room for technical details as well as discussion of backgrounds and strategies. The program schedule is below. </p>
+<p>
+Registration is at <a href="https://register.guadec.org/";>register.guadec.org</a>. For more information, or if you are an open-software business interested in participating, please contact Sanne te Meerman at &mdash; <em>sanne &lt;at sign&gt; opensourceadvies.nl</em> &mdash or at +31 6-1482-9390.</p>
+<p>&nbsp;</p><p>
+<a href="https://register.guadec.org/";><img src="http://www.guadec.org/img/register_now.png";></a>
                     </p>
 
-                    <p>
-                    If you are an early adopter, or want to become one, please contact Sanne te Meerman &mdash; <em>sanne &lt;at sign&gt; opensourceadvies.nl</em> &mdash; or visit this site regularly for updates on the program. This preconference is also accessible for open software businesses. However, you must be sponsor of GUADEC in order to participate. To become a sponsor, please take a look at the <a href="http://guadec.org/GUADEC%202010-final.pdf"; title="">GUADEC sponsor&#146;s folder</a>.
-                    </p>
                 </div>
                 
                 <div class="grid_5 omega">
@@ -39,20 +33,22 @@
                     <p> The GNOME Open Desktop Day is supported by:</p>
 
                     <p>
-                    <a lang="en-GB" href="https://noiv.nl/service/english/"; rel="external" title="Nederland Open in Verbinding  &raquo; English"><img src="{$baseUrl}/img/tgood-spnsrs/noiv.png" title="NOiV" alt="NOiV" /></a>
-                    <a lang="en-GB" href="http://www.minbzk.nl/english/"; rel="external" title="(Dutch) Ministry of the Interior and Kingdom Relations"><img src="{$baseUrl}/img/tgood-spnsrs/min-biza.png" title="(Dutch) Ministry of the Interior and Kingdom Relations" alt="Ministerie van Binnenlandse Zaken en Koninkrijksrelaties" /></a>
-                    <a lang=nl-NL" href="http://www.ictivity.nl/"; rel="external" title="Ictivity"><img src="{$baseUrl}/img/tgood-spnsrs/ictivity.png" title="Ictivity" alt="Ictivity" /></a>
+                    <a lang="en-GB" href="https://noiv.nl/service/english/"; rel="external" title="Nederland Open in Verbinding  &raquo; English"><img src="{$baseUrl}/img/tgood-spnsrs/noiv.png" alt="NOiV" /></a>
+                    <a lang="en-GB" href="http://www.minbzk.nl/english/"; rel="external" title="(Dutch) Ministry of the Interior and Kingdom Relations"><img src="{$baseUrl}/img/tgood-spnsrs/min-biza.png" alt="Ministerie van Binnenlandse Zaken en Koninkrijksrelaties" /></a>
+                    <a lang=nl-NL" href="http://www.ictivity.nl/"; rel="external" title="Ictivity"><img src="{$baseUrl}/img/tgood-spnsrs/ictivity.png" alt="Ictivity" /></a>
+                    <a href="http://lpi.org/"; rel="external" title="Linux Professional Institute"><img src="{$baseUrl}/img/tgood-spnsrs/lpi.png" alt="LPI" /></a>
                     </p>
 
                     <p>
                     The <a href="#arjen-kamphuis" title="Arjen Kamphuis">Chair of the Day</a> is provided by:<br/>
                     <a lang="nl-NL" href="http://www.gendo.nl/"; rel="external" title="Gendo"><img src="{$baseUrl}/img/tgood-spnsrs/gendo.png" title="Gendo" alt="Gendo" /></a>
                     </p>
+
                 </div>
                 
                 <div class="grid_16 alpha omega">
                     <a name="schedule"></a>
-                    <h2>Preliminary schedule</h2>
+                    <h2>Schedule</h2>
                     <div id="opendesktopschedule">
                     <table>
                     <thead>
@@ -65,60 +61,51 @@
                     <tr>
                         <td>9:30 - 11:00</td>
                         <td>
-                            <strong>Information market</strong><br/>
+                            <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.
                         </td>
                     </tr>
                     <tr>
                         <td>11:00 - 12:00</td>
                         <td>
-                            <strong>Meet the GNOME Foundation</strong><br/>
-                            With, amongst others:
-                            <ul>
-                                <li><em><a href="#stormy-peters" title="Stormy Peters">Stormy Peters</a></em>, Executive Director of the GNOME Foundation.</li>
-                            </ul>
+                            <strong>Meet the GNOME Foundation</strong><br/><br/>
+                            The GNOME project started in 1997. Since then, GNOME has become the default desktop environment in many successful Linux, BSD and Unix distributions. In this session, <a href="#stormy-peters" title="Stormy Peters"><em>Stormy Peters</em></a>, Executive Director of the GNOME Foundation, and other members of the GNOME organization will present some of GNOME's rich history, take a look at past succeses, give the audience insights on GNOME's path forward in the future.
                         </td>
                     </tr>
                     <tr>
-                        <td>12:00 - 13:00</td>
+                        <td>12:00</td>
                         <td class="purple">Lunch</td>
                     </tr>
                     <tr>
-                        <td>13:00 - 14:15</td>
+                        <td>13:00 - 14:00</td>
                         <td>
-                            <strong>GNOME and other free or open source on the desktop</strong><br/>
-                        	With, amongst others:
-	                        <ul>
-	                            <li><em><a href="#daniel-armendariz" title="Daniel Armend&aacute;riz">Daniel Armend&aacute;riz</a></em>, coordinator of the technical office of free and open source of the Basque government.</li>
+                            <strong>Big deployments in Europe: a system integrator's perspective</strong><br/><br/>
+                        	<a href="#steve-george" title="Steve George"><em>Steve George</em></a> of <a href="http://www.canonical.com/";>Canonical</a> talks about Canonical's experience with amongst others, the migration of 15,000 laptops in France to a Linux-based desktop. How were these projects handled from a strategic point of view? What challenges in terms of application integration were encountered? What did it mean in terms of cost-savings?</li>
                             </ul>
                         </td>
                     </tr>
                     <tr>
-                        <td>14:15 - 14:30</td>
+                        <td>14:00</td>
                         <td class="purple">Break</td>
                     </tr>
                     <tr>
-                        <td>14:30 - 15:45</td>
+                        <td>14:15 - 15:45</td>
                         <td>
-                            <strong>The GNOME Accessibility Project, and its use within the government of Andalucia</strong><br/>
-                        	With, amongst others: 
-	                        <ul>
-	                            <li><em><a href="#jose-felix-ontanon" title="Jos&eacute; F&eacute;lix Onta&ntilde;&oacute;n">Jos&eacute; F&eacute;lix Onta&ntilde;&oacute;n</a></em>, project manager for Emergya that manages the Guadalinfo software, a project of 740 telecentres in Andalusian towns and cities;</li>
-	                            <li><em><a href="#juan-conde" title="Juan Conde">Juan Conde</a></em>, (with reservation) manager of the free software section at the secretariat of telecommunications and information society of Junta de Andaluc&iacute;a.</li>
-	                        </ul>
+                            <strong>Ubiquitous Open Source in Spain: How government, business and community work together</strong><br/><br/>
+                        	Andalucia, a Spanish region with 8 million inhabitants, has launched a Linux distribution of called <a href="http://www.guadalinex.org/";>GuadaLinex</a>. The system is now used on more than 500,000 desktops in public education, 764 community 'cybercenters', over 600 public libraries and some 200 elderly care centers. <em><a href="#juan-conde" title="Juan Conde">Juan Conde</a></em>, FOSS manager of the telecommunications and information society of Junta de Andaluc&iacute;a, and <em><a href="#jose-felix-ontanon" title="Jos&eacute; F&eacute;lix Onta&ntilde;&oacute;n">Jos&eacute; F&eacute;lix Onta&ntilde;&oacute;n</a></em>, project manager for Guadalinfo software, will guide the audience through an in-depth look at their work, from project and technical issues to software maintenance and how the project feeds other Linux distributions.
                         </td>
                     </tr>
                     <tr>
-                        <td>15:45 - 16:00</td>
+                        <td>15:45</td>
                         <td class="purple">Break</td>
                     </tr>
                     <tr>
                         <td>16:00 - 17:30</td>
                         <td>
-                            <strong>How we can move forward in the Netherlands with free and open software on the desktop</strong> <em>(interactive session)</em><br/>
+                            <strong>How we can move forward in the Netherlands with free and open software on the desktop</strong> <em>(interactive session)</em><br/><br/>
                         	With:	
 	                        <ul>
-	                            <li><em><a href="#stephan-wildeboer" title="Stephan Wildeboer">Stephan Wildeboer</a></em>, project manager of several government projects regarding the use of free and open software in the Netherlands;</li>
+	                            <li><em><a href="#stephan-wildeboer" title="Stephan Wildeboer">Stephan Wildeboer</a></em>, project manager of several government projects regarding the use of free and open software in the Netherlands.</li>
 	                            <li><em><a href="#arjen-kamphuis" title="Arjen Kamphuis">Arjen Kamphuis</a></em>, independent advisor and co-author of the first initiative in parliament to push free and open software in government.</li>
                             </ul>
                         </td>
@@ -142,14 +129,6 @@
                         <tbody>
                         <tr>
                             <td>
-                                <a name="daniel-armendariz"></a><img src="{$baseUrl}/img/tgood-speakers/daniel_armendariz.jpg" alt="" /><br /> <strong>Daniel Armend&aacute;riz Crespo</strong>
-                            </td>
-                            <td>
-                                <strong>Daniel Armend&aacute;riz Crespo</strong> graduated from the University of Navarra with studies in Economics and Computer Science. He is currently the director of the Basque government's technical office of free and open software. Daniel was involved in the foundation of several initiatives and open source related transnational companies, such as 'Ikusnet' and 'INFLOSS World'.
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>
                                 <a name="juan-conde"></a><img src="{$baseUrl}/img/tgood-speakers/juan_conde.jpg" alt="" /><br /> <strong>Juan Conde</strong>
                             </td>
                             <td>
@@ -164,6 +143,15 @@
                                 <strong>Jos&eacute; F&eacute;lix Onta&ntilde;&oacute;n</strong> has studied Computing Engineering in Seville and works as project manager for the <abbr title="free and open source software">FOSS</abbr> company 'Emergya'. He worked as core-developer for the Andalucian distribution <a lang="es-ES" href="http://www.guadalinex.org/"; rel="external" title="Portal Guadalinex">Guadalinex</a>. He is a key coordinator in the Guadalinfo Accesibillity project, which aims to enhance and improve the Orca screen reader and OCRFeeder, a document layout analysis and optical character recognition system. Besides managing the current Guadalinfo software, he also helps run a project of 740 telecenters in Andalusian towns and municipalities with their own GNOME-based GNU/Linux flavour Guadalinex Guadalinfo.
                             </td>
                         </tr>
+
+<tr>
+                            <td>
+                                <a name="steve george"></a><img src="{$baseUrl}/img/tgood-speakers/stevegeorge2010m.jpg" alt="" /><br /> <strong>Steve George</strong>
+                            </td> 
+                            <td>
+                                <strong>Steve George</strong> Steve George is Vice President of Business Development at Canonical Limited, the sponsors of Ubuntu. He is responsible for leading strategic initiatives and relationships that broaden the take-up of the Ubuntu platform amongst developers and users. Since Steve joined Canonical in 2006 he has helped the company build its commercial open source strategy, with a focus on business development, product management and operations.
+                            </td> 
+                        </tr>
                         <tr>
                             <td>
                                 <a name="arjen-kamphuis"></a>
@@ -192,6 +180,7 @@
                         </tr>
                         </tbody>
                         </table>
+<p align="right"><a href="http://www.guadec.org/docs/GNOME_ Open_Desktop_Day.pdf">Click here to see the original brochure (<em>Dutch</em>).</a> <a href="http://www.guadec.org/docs/GNOME_ Open_Desktop_Day.pdf"><img src="http://www.guadec.org/img/brochure-smallpic.png";></a></p>
                     </div>
                 </div>
 
diff --git a/templates/schedConf/sponsors.tpl b/templates/schedConf/sponsors.tpl
new file mode 100644
index 0000000..82104f0
--- /dev/null
+++ b/templates/schedConf/sponsors.tpl
@@ -0,0 +1,336 @@
+{**
+ * index.tpl
+ *
+ * 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.
+ *
+ * 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="GUADEC 2010 Sponsors"}
+{include file="common/header.tpl"}
+
+<div id="sponsors">
+<p>
+<abbr title="GNOME Users&#146; And Developers&#146; European Conference">GUADEC</abbr> 2010 wouldn't be possible with the generous support from our sponsors. This page provides an overview of most important sponsors and gives a description of them.
+</p>
+
+<div class="clear"></div>
+
+{* Silver sponsors *}
+<div class="grid_4 alpha" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<a name="canonical"></a>
+<p>
+<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"/></a>
+</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>
+
+<p>
+While our main goal is to ensure that Ubuntu continues to be freely available to everyone around the world, we are also focused on building new tools and software to encourage innovation. Projects like Upstart, Apport, Launchpad and Bazaar are just a few examples of our ongoing commitment to initiatives that promote software development and collaboration throughout the community.
+</p>
+
+<p>
+Learn more at <a lang="en-GB" href="http://www.canonical.com/"; itemprop="url" rel="external" title="Canonical">www.canonical.com</a>.
+</p>
+
+</div>
+
+<div class="grid_4" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<a name="collabora"></a>
+
+<p>
+<a lang="en-GB"  href="http://www.collabora.co.uk/"; itemprop="url" rel="external"  title="Collabora"><img src="{$baseUrl}/img/spnsrs-overview/collabora.png" alt="Collabora"/></a>
+</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.
+</p>
+
+<p>
+Learn more at <a lang="en-GB"  href="http://www.collabora.co.uk/"; itemprop="url" rel="external"  title="Collabora">www.collabora.co.uk</a>.
+</p>
+
+</div>
+
+<div class="grid_4" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<a name="google"></a>
+
+<p>
+<a href="http://www.google.com/"; itemprop="url" rel="external" title="Google"><img src="{$baseUrl}/img/spnsrs-overview/google.png" alt="Google"/></a>
+</p>
+
+<p>
+<span itemprop="name">Google</span>'s innovative search technologies connect millions of people around the world with information every day. Founded in 1998 by Stanford Ph.D. students Larry Page and Sergey Brin, Google today is a top web property in all major global markets. Google's targeted advertising program provides businesses of all sizes with measurable results, while enhancing the overall web experience for users.</p>
+
+<p>
+Google is headquartered in <span itemprop="address" itemscope itemtype="http://data-vocabulary.org/Address";><span itemprop="region">Silicon Valley</span></span> with offices throughout the Americas, Europe, Oceania and Asia.
+</p>
+
+<p>
+Learn more at <a href="http://www.google.com/"; itemprop="url" rel="external" title="Google">www.google.com</a>.
+</p>
+
+</div> 
+
+<div class="grid_4 omega" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<a name="igalia"></a>
+
+<p>
+<a lang="en-GB" href="http://www.igalia.com/"; itemprop="url" rel="external" title="Igalia"><img src="{$baseUrl}/img/spnsrs-overview/igalia.png" alt="Igalia"/></a>
+</p>
+<p>
+<span itemprop="name">Igalia</span> is an open source consultancy specialized in the development of
+innovative free software technologies and solutions.
+</p>
+
+<p>
+Igalia has been increasing its involvement in the GNOME community
+since the creation of the company nine years ago, contributing with
+code and documentation to various platform components and
+applications, and sponsoring and organizing events. Igalia is a member
+of the GNOME Foundation's Advisory Board.
+</p>
+
+<p>
+Besides working in the desktop, the company applies its wide
+experience on free software, GNOME, WebKit, GStreamer, and other Linux
+and Freedesktop.org technologies to the mobile market, contributing to
+different platforms and developing projects for relevant international
+companies.
+</p>
+
+<p>
+Learn more at <a lang="en-GB" href="http://www.igalia.com/"; itemprop="url" rel="external" title="Igalia">www.igalia.com</a>.
+</p>
+
+</div>
+
+<div class="clear"></div>
+
+<div class="grid_4 alpha" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<a name="intel"></a>
+
+<p>
+<a href="http://www.intel.com/opensource"; itemprop="url" rel="external" title="Intel"><img src="{$baseUrl}/img/spnsrs-overview/intel.png" alt="Intel"/></a>
+</p>
+<p>
+
+<p>
+<span itemprop="name">Intel</span>, the world leader in silicon innovation, develops technologies, products and initiatives to continually advance how people work and live.
+</p>
+
+<p>
+Intel Software provides technologies, products and services developers need to create innovative products and industry-leading software solutions on Intel platforms.
+</p>
+
+<p>
+Intel has been actively innovating with the open source community and collaborates with commercial vendors to develop Linux and key Open Source solutions.
+</p>
+
+<p>Learn more at <a href="http://www.intel.com/opensource"; itemprop="url" rel="external" title="Intel">http://www.intel.com/opensource</a>.</p>
+
+</div>
+
+<div class="grid_4" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<a name="lanedo"></a>
+
+<p>
+<a lang="en-GB" href="http://www.lanedo.com/"; itemprop="url" rel="external" title="Lanedo"><img src="{$baseUrl}/img/spnsrs-overview/lanedo.png" alt="Lanedo"/></a>
+</p>
+<p>
+We believe in open source and we have a passion for it! The developers at <span itemprop="name">Lanedo</span> have delivered infrastructure to the GNOME platform for over a decade and been directly involved in the Maemo & MeeGo platforms. Providing leading expertise and services around the GNOME ecosystem, Linux and Unix in general.</p>
+
+<p>Learn more at <a lang="en-GB" href="http://www.lanedo.com/"; itemprop="url" rel="external" title="Lanedo">www.lanedo.com</a>.</p>
+
+</div>
+
+<div class="grid_4" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<a name="linux-foundation"></a>
+
+<p>
+<a href="http://www.linuxfoundation.org/"; rel="external" itemprop="url" title="The Linux Foundation"><img src="{$baseUrl}/img/spnsrs-overview/linux-foundation.png" alt="The Linux Foundation"/></a>
+</p>
+
+<p>
+Founded in 2007, the <span itemprop="name">Linux Foundation</span> sponsors the work of Linux creator Linus Torvalds and is supported by leading Linux and open source companies and developers from around the world. The Linux Foundation promotes, protects and standardizes Linux by providing unified resources and services needed for open source to successfully compete with closed platforms.
+</p>
+
+<p>
+Learn more at <a href="http://www.linuxfoundation.org/"; rel="external" itemprop="url" title="The Linux Foundation">www.linuxfoundation.org</a>.
+</p>
+
+</div>
+
+<div class="grid_4 omega" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<a name="linux-magazine"></a>
+<p>
+<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"/></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>
+
+<div class="clear"></div>
+
+<div class="grid_4 alpha" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<a name="meego"></a>
+
+<p>
+<a  href="http://meego.com/"; rel="external" itemprop="url" title="MeeGo"><img src="{$baseUrl}/img/spnsrs-overview/meego.png" alt="MeeGo"/></a>
+</p>
+
+<p>
+Learn more at <a  href="http://meego.com/"; rel="external" itemprop="url" title="MeeGo">meego.com</a>.
+</p>
+
+</div>
+
+
+<div class="grid_4" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<a name="nokia"></a>
+
+<p>
+<a  href="http://www.nokia.com/"; rel="external" itemprop="url" title="Nokia"><img src="{$baseUrl}/img/spnsrs-overview/nokia.png" alt="Nokia"/></a>
+</p>
+
+<p>
+Learn more at <a  href="http://www.nokia.com/"; rel="external" itemprop="url" title="Nokia">www.nokia.com</a>.
+</p>
+
+</div>
+
+<div class="grid_4" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<a name="opensuse"></a>
+
+<p>
+<a href="http://www.opensuse.org/en/"; rel="external" itemprop="url" title="openSUSE.org"><img src="{$baseUrl}/img/spnsrs-overview/opensuse.png" alt="openSUSE"/></a>
+</p>
+
+<p>
+<span itemprop="name">The openSUSE Project</span> is a world-wide project sponsored by Novell that promotes the use of Linux everywhere.
+</p>
+
+<p>
+The openSUSE Linux distribution provides everything you need to get started with Linux on the server, desktop, and for mobile computing.
+</p>
+
+<p>
+The openSUSE Project is a world-wide community of contributors working together to create and distribute the worldâs most usable Linux distribution.
+</p>
+
+<p>
+Learn more at <a href="http://www.opensuse.org/en/"; rel="external" itemprop="url" title="openSUSE.org">www.opensuse.org</a>.
+</p>
+
+</div>
+
+<div class="grid_4 omega" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<a name="redhat"></a>
+
+<p>
+<a href="http://www.redhat.com/"; rel="external" itemprop="url" title="redhat.com"><img src="{$baseUrl}/img/spnsrs-overview/redhat.png" alt="RedHat"/></a>
+</p>
+
+<p>
+<span itemprop="name">Red Hat</span>, the world's leading provider of open source solutions and an S&P 500 company, is headquartered in <span itemprop="address" itemscope itemtype="http://data-vocabulary.org/Address";><span itemprop="locality">Raleigh</span>, <span itemprop="region">NC</span></span> with over 65 offices spanning the globe. CIOs ranked Red Hat as one of the top vendors delivering value in Enterprise Software for six consecutive years in the CIO Insight Magazine Vendor Value survey.
+</p>
+
+<p>
+Red Hat provides high-quality, affordable technology with its operating system platform, Red Hat Enterprise Linux, together with virtualization, applications, management and Services Oriented Architecture (SOA) solutions, including Red Hat Enterprise Virtualization and JBoss Enterprise Middleware.
+</p>
+
+<p>
+Red Hat also offers support, training and consulting services to its customers worldwide.
+</p>
+
+<p>
+Learn more at <a href="http://www.redhat.com/"; rel="external" itemprop="url" title="redhat.com">www.redhat.com</a>.
+</p>
+
+</div>
+
+<div class="clear"></div>
+
+<div class="grid_4 alpha" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<a name="ubuntu-user"></a>
+
+<p>
+<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"/></a>
+</p>
+
+<p>
+<abbr title="GNOME Users&#146; And Developers&#146; European Conference">GUADEC</abbr> 2010 is sponsored by <span itemprop="name">Ubuntu User</span>
+    <a href="http://www.ubuntu-user.com/"; rel="external" itemprop="url" title="Ubuntu User (United States)">United States</a> and
+    <a lang="de-DE" href="http://www.ubuntu-user.de/"; rel="external" itemprop="url" title="Ubuntu User (Deutschland)">Germany</a>.
+</p>
+
+</div>
+
+{* Bronze sponsors *}
+
+<div class="grid_4" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<a name="arm"></a>
+<p><a href="http://www.arm.com/"; rel="external" itemprop="url" title="ARM"><img src="{$baseUrl}/img/spnsrs-overview/arm.png" alt="ARM"/></a></p>
+
+<p>
+<span itemprop="name">ARM</span> designs the technology that lies at the heart of advanced digital products, from wireless, networking and consumer entertainment solutions to imaging, automotive, security and storage devices. ARM's comprehensive product offering includes 32-bit RISC microprocessors, graphics processors, enabling software, cell libraries, embedded memories, high-speed connectivity products, peripherals and development tools.</p>
+
+<p>
+Combined with comprehensive design services, training, support and maintenance, and the company's broad Partner Community, they provide a total system solution that offers a fast, reliable path to market for leading electronics companies.
+</p>
+
+<p>
+Learn more at <a href="http://www.arm.com/"; itemprop="url" rel="external" title="ARM">www.arm.com</a>.
+</p>
+
+</div>
+
+<div class="grid_4" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<a name="openismus"></a>
+
+<p>
+<a href="http://www.openismus.com/"; rel="external" itemprop="url" title="Openismus"><img src="{$baseUrl}/img/spnsrs-overview/openismus.png" alt="Openismus"/></a>
+</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="grid_4 omega" itemscope itemtype="http://data-vocabulary.org/Organization";>
+<a name="mozilla"></a>
+
+<p>
+<a  href="http://www.mozilla.org/"; rel="external" itemprop="url" title="Mozilla.org"><img src="{$baseUrl}/img/spnsrs-overview/mozilla.png" alt="Mozilla"/></a>
+</p>
+<p>
+<span itemprop="name">Mozilla</span> is an international non-profit organization and a global community dedicated to improving the Internet experience for people everywhere. We create free, open source products and technologies through highly disciplined, transparent and cooperative process. Everything we create is a public asset available for others to use, adapt and improve. The result is great products built by passionate people &mdash; and better choices for everyone.
+</p>
+
+<p>
+Learn more at <a  href="http://www.mozilla.org/"; rel="external" title="Mozilla.org">www.mozilla.org</a>.
+</p>
+
+</div>
+
+<div class="clear"></div>
+
+</div>
+
+{include file="common/footer.tpl"}
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]