Commit graph

891 commits

Author SHA1 Message Date
Bradley M. Kuhn
970c60efba Note license is now USA version. 2013-04-26 16:01:43 -04:00
Bradley M. Kuhn
6245f886f0 Import of admin module is needed to do admin.autodiscover() 2013-04-26 13:11:25 -04:00
Bradley M. Kuhn
1e119efb7a Incorporate conservancy_ssl middleware, etc. into main site, now that HTTPS fully supported.
Previously, SSL on sfconservancy.org was supported using a self-signed cert
only to handle the /admin/ portion of the site.  Now that SSL is supported
site-wide, and perfectly mirrors the content available via HTTP, the
conservancy_ssl middleware, URLs, and settings are wholly deprecated and
herein removed.

The main site's urls.py now need adjusting to support /admin/, but additional
code is needed in middleware.py to avoid accidentally serving /admin/ via
HTTP instead of HTTPS.

The latter code is untested; hopefully it works "out of the box". :)
2013-04-26 13:09:24 -04:00
Bradley M. Kuhn
536789a8c0 Don't index some pages. 2013-04-26 13:01:29 -04:00
Bradley M. Kuhn
1032f1d75f sfconservancy.org now has an SSL certificate; make site HTTPS-Everywhere compatible.
Change all links when possible to not mention a site, so HTTPS will be used
automatically for same-site links.

For embedded images, and other links out to the rest of the world, use HTTPS
when the site is known to support it.
2013-04-26 12:48:19 -04:00
Bradley M. Kuhn
1cea37a8bc Titles don't appear with anyone else, and probably should not for these two
either on this particular page.
2013-04-23 16:39:05 -04:00
Bradley M. Kuhn
b6b6fd513a A bit more detail on what the Eval Committee does. 2013-04-23 13:28:57 -04:00
Bradley M. Kuhn
f5f1efa6e1 Say "et alia" here instead of Contractors, since we have no Contractors listed,
but *do* have Directors Emeriti listed.
2013-04-23 13:24:36 -04:00
Bradley M. Kuhn
fc5247fe0a Ah, the string needs to match here as well. 2013-04-23 13:22:46 -04:00
Bradley M. Kuhn
63f708f928 Will a shorter string make this work? Unsure why it isn't working now, actually. 2013-04-23 13:20:35 -04:00
Bradley M. Kuhn
3202d679c5 Properly set class for CCS so the EvalCommittee menu item formats properly. 2013-04-23 13:16:15 -04:00
Martin Michlmayr
797c361236 Add page for Evaluation Committee 2013-04-23 13:09:57 -04:00
Mike Linksvayer
bb3063601b add me 2013-04-23 13:08:25 -04:00
Martin Michlmayr
abf12d29df Merge branch 'master' of https://git.gitorious.org/conservancy/website 2013-03-20 13:56:11 +00:00
Bradley M. Kuhn
ccfe18b7ba Paul has moved on to a full-time job that doesn't leave him any time for
contracting with us anymore.
2013-03-01 12:15:02 -05:00
Bradley M. Kuhn
f1575ece1a Merge in various HTML fixes from Martin Michlmayr <tbm@cyrius.com> on 2013-02-21.
This did not fast-forward merge because I'd made changes to those files since
Martin submitted his merge request.  This merge brings in the changes
contributed in the following two commits from Martin:

commit 8b54927bb5
Author: Martin Michlmayr <tbm@cyrius.com>
Date:   2013-02-21 21:47:15 +0000

    Remove stray character

commit 660c48a528
Author: Martin Michlmayr <tbm@cyrius.com>
Date:   2013-02-21 21:46:40 +0000

    Fix various HTML syntax errors
2013-03-01 12:03:43 -05:00
Bradley M. Kuhn
e095403311 Fix broken HTML tag. 2013-03-01 11:49:57 -05:00
Bradley M. Kuhn
43fff9cfdd Properly decline your Latin adjectives.
I'm embarrassed that I didn't notice this before!  I took Latin for 7 years
in school!
2013-03-01 11:49:35 -05:00
Bradley M. Kuhn
b329fc8bbb Forms should be plural here, since it's 990 and 990-T 2013-03-01 11:41:35 -05:00
Bradley M. Kuhn
44c1cad354 Final roll out of logo, to make PNG and SVG files in /img. 2013-02-28 16:24:00 -05:00
Bradley M. Kuhn
ef5fbac055 New conservancy-header image from Tony; also change CSS to match. 2013-02-28 16:13:44 -05:00
Bradley M. Kuhn
686a0d92ce s/In/For/: sounds better. 2013-02-28 16:10:00 -05:00
Bradley M. Kuhn
ba5484a335 Switch to CC-By-SA-USA-3.0 instead of Unported. 2013-02-28 16:02:28 -05:00
Bradley M. Kuhn
f50ccef84e Perhaps this height needs to be increased as well? 2013-02-28 15:48:41 -05:00
Bradley M. Kuhn
35259a101c Height and width to match the bigger size of the existing file. 2013-02-28 15:45:53 -05:00
Bradley M. Kuhn
db43d270a6 Add missing ) 2013-02-28 15:42:43 -05:00
Bradley M. Kuhn
1a1e146ff5 Changes to implement new logo, as requested by Tony. 2013-02-28 15:42:06 -05:00
Bradley M. Kuhn
9a61505fb5 Add FY 2011 annual report. 2013-02-28 15:19:52 -05:00
Bradley M. Kuhn
2eabc054ac Corrected mistyped year. 2013-02-28 15:18:11 -05:00
Bradley M. Kuhn
f7c2fe1ffb Add FY 2012. 2013-02-28 15:14:43 -05:00
Bradley M. Kuhn
cc33471cf5 Add dates for FY periods. 2013-02-28 15:13:50 -05:00
Bradley M. Kuhn
658322c045 Added FY 2011 Independent Auditors' report. 2013-02-28 15:09:07 -05:00
Bradley M. Kuhn
afead8bedf Added FY 2011 CHAR-500. 2013-02-28 15:05:49 -05:00
Bradley M. Kuhn
28276b5241 Added FY 2011 Form 990 and Form 990-T 2013-02-28 14:33:07 -05:00
Martin Michlmayr
8b54927bb5 Remove stray character 2013-02-21 21:59:29 +00:00
Martin Michlmayr
660c48a528 Fix various HTML syntax errors 2013-02-21 21:59:26 +00:00
Martin Michlmayr
ef1cd60d51 Remove stray character 2013-02-21 21:47:15 +00:00
Martin Michlmayr
7ccc53805a Fix various HTML syntax errors 2013-02-21 21:46:40 +00:00
Martin Michlmayr
98474cd27e Merge branch 'master' of https://git.gitorious.org/conservancy/website 2013-02-21 21:31:30 +00:00
Bradley M. Kuhn
a18e221dc6 Move email subscribe box to the front page only.
It just looked wrong up there on top of the page.  I know that's what I
suggested to Paul to do it, but 11 months later, when I finally accepted his
merge request, it just didn't make sense.
2013-02-21 13:42:10 -05:00
Paul Visscher
a4255c7e51 Add subscription form to the top right of the site (possibly all pages).
I was only able to get the site running on my local machine well enough to test the main page. It's possible, based on the filename, that the changes will appear on all Conservancy pages. I'm not sure if that is what is wanted or not. If not, it seems like some more invasive changes would need to be made to the base template so that the form would only appear on the index page.

The form POSTs to a mailman url. Once submitted, the user is redirected to the mailman site with no obvious way (aside from the back button) to return to the main site. This can be fixed by using AJAX to POST the form and report the subscription status back to the user, but it would likely require parsing the mailman html as there doesn't appear to be any real API to mailman.

I tested this in Firefox 11.0 and Chrome 18.0.1025.113 beta.
2013-02-21 13:34:54 -05:00
Martin Michlmayr
4b5ed81a17 Add Metalink
Metalink joined in November, according to
http://sfconservancy.org/news/2012/nov/20/metalink-joins/
2013-02-21 13:26:22 -05:00
Martin Michlmayr
c9af6ebd12 Sort projects alphabetically (move Mifos after Mercurial) 2013-02-21 13:26:22 -05:00
Martin Michlmayr
2bdf5980b0 Fix member count
The member count wasn't updated when the "GPL Compliance Project for
Linux Developers" project was added.
2013-02-21 13:26:21 -05:00
Tony Sebro
2fdb22fc9a spotted a few more errant "The"s; deleted them. 2013-02-21 13:19:01 -05:00
Martin Michlmayr
cb3031ef34 Add Metalink
Metalink joined in November, according to
http://sfconservancy.org/news/2012/nov/20/metalink-joins/
2013-02-21 17:57:21 +00:00
Martin Michlmayr
8615526ad5 Sort projects alphabetically (move Mifos after Mercurial) 2013-02-21 17:53:36 +00:00
Martin Michlmayr
9b38281edd Fix member count
The member count wasn't updated when the "GPL Compliance Project for
Linux Developers" project was added.
2013-02-21 17:46:30 +00:00
Bradley M. Kuhn
aac6a0c94e Update FSA template to match what Conservancy is currently using; only a few changes. 2013-02-05 13:42:09 -05:00
Bradley M. Kuhn
17f49d99c0 Filing deadline extension due to Hurricane Sandy. 2013-01-09 10:50:26 -05:00