From d2af6a0cb51101387439d3ce39ccf53628b087e3 Mon Sep 17 00:00:00 2001 From: "Bradley M. Kuhn" Date: Sun, 3 Oct 2010 19:07:48 -0400 Subject: [PATCH] Rework of about section, including many content changes and a few formatting ones. --- www/conservancy/static/about/board/index.html | 28 ++++++++-- .../static/about/contact/index.html | 19 ++++--- .../static/about/filings/index.html | 24 +++++++++ www/conservancy/static/about/index.html | 52 ++++++------------- www/conservancy/static/conservancy.css | 1 + www/conservancy/static/donate/index.html | 29 ++++++----- www/conservancy/templates/base_about.html | 25 +-------- .../templates/base_conservancy.html | 3 +- .../templates/news/pressrelease_list.html | 5 +- 9 files changed, 100 insertions(+), 86 deletions(-) create mode 100644 www/conservancy/static/about/filings/index.html diff --git a/www/conservancy/static/about/board/index.html b/www/conservancy/static/about/board/index.html index aa583b1c..a702c906 100644 --- a/www/conservancy/static/about/board/index.html +++ b/www/conservancy/static/about/board/index.html @@ -7,9 +7,21 @@

The Conservancy is directed by the following Board of Directors.

-

Loic Dachary

+

Jeremy Allison

-

Loic Dachary has been involved with Free Software since 1987 when he +

Jeremy Allison works for Google's Open Source Programs Office, as part +of a team helping Google work with and release Open Source software. He is +one of Google's representatives to the Open Source community and has been +writing Open Source software for over twenty years. Jeremy is also one of +the lead developers on the Samba Team, a group of programmers developing +an Open Source Windows (tm) compatible file and print server product for +UNIX (tm) systems. As well as writing code, Jeremy handles the +co-ordination of Samba development efforts and acts as a corporate liaison +to companies using the Samba code commercially.

+ +

Loïc Dachary

+ +

Loïc Dachary has been involved with Free Software since 1987 when he started distributing GNU tapes to the general public in France. His first contact was with GNU Emacs and in 1989 with GCC which he used to port a Unix System V kernel to a embeded motorola 68030 motherboard. He @@ -25,7 +37,17 @@ dedicated to Free Software with over 5,500 members.

Mark Galassi

-

Mark Galassi has been involved in the GNU project since 1984. He currently works as a researcher in the International, Space, and Response division at Los Alamos National Laboratory, where he has worked on the HETE-2 satellite, ISIS/Genie, the Raptor telescope, the Swift satellite, and the muon tomography project. In 1997 Mark took a couple of years off from Los Alamos (where he was previously in the ISR division and the Theoretical Astrophysics group) to work for Cygnus (now a part of Red Hat) writing software and books for eCos,although he continued working on the HETE-2 satellite (an astrophysical Gamma Ray Burst mission) part time. Mark earned his BA in Physics at Reed College and a PhD from the Institute for Theoretical Physics at Stony Brook.

+

Mark Galassi has been involved in the GNU project since 1984. He +currently works as a researcher in the International, Space, and Response +division at Los Alamos National Laboratory, where he has worked on the +HETE-2 satellite, ISIS/Genie, the Raptor telescope, the Swift satellite, +and the muon tomography project. In 1997 Mark took a couple of years off +from Los Alamos (where he was previously in the ISR division and the +Theoretical Astrophysics group) to work for Cygnus (now a part of Red Hat) +writing software and books for eCos,although he continued working on the +HETE-2 satellite (an astrophysical Gamma Ray Burst mission) part +time. Mark earned his BA in Physics at Reed College and a PhD from the +Institute for Theoretical Physics at Stony Brook.

Bradley M. Kuhn

diff --git a/www/conservancy/static/about/contact/index.html b/www/conservancy/static/about/contact/index.html index 1efbb0cb..a1403540 100644 --- a/www/conservancy/static/about/contact/index.html +++ b/www/conservancy/static/about/contact/index.html @@ -5,23 +5,22 @@

Contact the Conservancy

-

The best way to contact the Conservancy is via email to <info@sfconservancy.org>. -We do our best to respond to all email within a reasonable time -period. If you don't hear from us within a few days, please try -again.

+

The best way to contact the Conservancy is via email +to <info@sfconservancy.org>. +We do our best to respond to all email within a reasonable time period. +If you don't hear from us within a week, please try again.

Telephone

+1-212-461-3245 tel
-+1-212-580-0898 fax

+

Postal Address

-

Software Freedom Conservancy
-1995 Broadway FL 17
-New York, NY 10023-5882

+

Software Freedom Conservancy, Inc.
+137 MONTAGUE ST STE 380
+Brooklyn, NY 11201-3548

Internet Relay Chat

-

Our IRC room is #conservancy on irc.freenode.net.

+

Our IRC channel is #conservancy on irc.freenode.net.

{% endblock %} diff --git a/www/conservancy/static/about/filings/index.html b/www/conservancy/static/about/filings/index.html new file mode 100644 index 00000000..2344db87 --- /dev/null +++ b/www/conservancy/static/about/filings/index.html @@ -0,0 +1,24 @@ +{% extends "base_about.html" %} +{% block subtitle %}About - {% endblock %} +{% block content %} + +

Public Filings

+ +

Like all USA non-profits, the Conservancy files an annual Form 990 and, +as a non-profit in the State of New York, files an annual CHAR-500 with +New York State. Below, Conservancy makes available these filings for +public inspection, in reverse chronological order:

+ +

+