[foundation-web] Add Collabora to adboard and add news item about that

[Vincent Untz <vuntz src gnome org>]

commit 992c6e998a09eb2dedbb0a11cf11de0072bb42c3
Author: Vincent Untz <vuntz gnome org>
Date:   Wed May 5 11:15:11 2010 +0200

    Add Collabora to adboard and add news item about that

 foundation.gnome.org/about/index.wml         |    1 +
 foundation.gnome.org/img/logos/Makefile.am   |    1 +
 foundation.gnome.org/img/logos/collabora.png |  Bin 0 -> 5727 bytes
 foundation.gnome.org/index.wml               |   31 ++++++++++++-------------
 foundation.gnome.org/news/index.wml          |   13 +++++++++++
 5 files changed, 30 insertions(+), 16 deletions(-)
---
diff --git a/foundation.gnome.org/about/index.wml b/foundation.gnome.org/about/index.wml
index 4e3da1d..59ef2eb 100644
--- a/foundation.gnome.org/about/index.wml
+++ b/foundation.gnome.org/about/index.wml
@@ -118,6 +118,7 @@
 
     <ul>
       <li>Canonical</li>
+      <li>Collabora</li>
       <li>Debian Project</li>
       <li>Free Software Foundation</li>
       <li>Google</li>
diff --git a/foundation.gnome.org/img/logos/Makefile.am b/foundation.gnome.org/img/logos/Makefile.am
index a5719bf..b2af533 100644
--- a/foundation.gnome.org/img/logos/Makefile.am
+++ b/foundation.gnome.org/img/logos/Makefile.am
@@ -4,6 +4,7 @@ page_SCRIPTS =
 
 page_DATA = \
 	canonical.png \
+	collabora.png \
 	debian.gif \
 	fluendo.png \
 	fsf.png \
diff --git a/foundation.gnome.org/img/logos/collabora.png b/foundation.gnome.org/img/logos/collabora.png
new file mode 100644
index 0000000..cedd422
Binary files /dev/null and b/foundation.gnome.org/img/logos/collabora.png differ
diff --git a/foundation.gnome.org/index.wml b/foundation.gnome.org/index.wml
index e1e4ede..7fc6648 100644
--- a/foundation.gnome.org/index.wml
+++ b/foundation.gnome.org/index.wml
@@ -41,6 +41,19 @@
     <ul>
 
       <li>
+        <strong>Collabora Joins the GNOME Foundation Advisory Board</strong>
+        <small>(05/05/2010)</small>
+        <blockquote>
+	  Collabora is joining the GNOME Foundation advisory board today. A
+	  long time supporter of GNOME and member of the GNOME community,
+	  Collabora contributes directly to GNOME projects like Empathy,
+	  PiTiVi, Totem and Epiphany. Read the <a
+	  href="http://www.gnome.org/press/releases/2010-05-collabora-joins.html";>press
+	  release</a>.
+        </blockquote>
+      </li>
+
+      <li>
         <strong>GNOME Quarterly Report Q1 2010 released</strong>
         <small>(23/04/2010)</small>
         <blockquote>
@@ -70,28 +83,14 @@
         </blockquote>
       </li>
 
-      <li>
-        <strong>Mozilla Sponsors GNOME Accessibility Efforts</strong>
-        <small>(04/02/2010)</small>
-        <blockquote>
-	  The GNOME Foundation has received a substantial donation from the
-	  Mozilla Corporation to benefit accessibility (a11y) efforts. The
-	  donation will help continue the collaborative efforts between GNOME
-	  and Mozilla on a11y. The donation of $10,000 will be used in part to
-	  send GNOME developers to the 25th Annual International CSUN
-	  Technology &amp; Persons with Disabilities Conference. Read the <a
-	  href="http://www.gnome.org/press/releases/2010-02-mozilla-accessibility.html";>press
-	  release</a>.
-        </blockquote>
-      </li>
-
     </ul>
 
     <p>You can also find more informal news at the <a href="http://blogs.gnome.org/foundation/";>Foundation Blog</a>, or read <a href="news/">previous news</a>.</p>
 
     <h2>Sponsors</h2>
     <div class="center">
-      <a href="http://www.canonical.com/";><img src="img/logos/canonical.png" alt="Debian" border="0" hspace="8" vspace="5" align="middle" /></a>
+      <a href="http://www.canonical.com/";><img src="img/logos/canonical.png" alt="Canonical" border="0" hspace="8" vspace="5" align="middle" /></a>
+      <a href="http://www.collabora.co.uk/";><img src="img/logos/collabora.png" alt="Collabora" border="0" hspace="8" vspace="5" align="middle" /></a>
       <a href="http://www.debian.org/";><img src="img/logos/debian.gif" alt="Debian" border="0" hspace="8" vspace="5" align="middle" /></a>
       <a href="http://www.fsf.org/";><img src="img/logos/fsf.png" alt="Free Software Foundation" border="0" hspace="8" vspace="5" align="middle" /></a>
       <a href="http://www.google.com/";><img src="img/logos/google.png" alt="Google" border="0" hspace="8" vspace="5" align="middle" /></a>
diff --git a/foundation.gnome.org/news/index.wml b/foundation.gnome.org/news/index.wml
index 75a1789..4330122 100644
--- a/foundation.gnome.org/news/index.wml
+++ b/foundation.gnome.org/news/index.wml
@@ -16,6 +16,19 @@
     <ul>
 
       <li>
+        <strong>Collabora Joins the GNOME Foundation Advisory Board</strong>
+        <small>(05/05/2010)</small>
+        <blockquote>
+	  Collabora is joining the GNOME Foundation advisory board today. A
+	  long time supporter of GNOME and member of the GNOME community,
+	  Collabora contributes directly to GNOME projects like Empathy,
+	  PiTiVi, Totem and Epiphany. Read the <a
+	  href="http://www.gnome.org/press/releases/2010-05-collabora-joins.html";>press
+	  release</a>.
+        </blockquote>
+      </li>
+
+      <li>
         <strong>GNOME Quarterly Report Q1 2010 released</strong>
         <small>(23/04/2010)</small>
         <blockquote>