Conservancy/website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
413 commits 2 branches 0 tags 365 MiB
Commit graph

380 commits

Author SHA1 Message Date
Bradley M. Kuhn
772cc17e18 Move flattr to the bottom of the donate window. 2013-04-30 22:26:56 -04:00
Bradley M. Kuhn
3ae257e7a5 Make Google Checkout popup rather than there by default. 2013-04-30 22:25:49 -04:00
Bradley M. Kuhn
d3534ed6d0 Put PayPal above Google Checkout, since it can take credit-cards straight up. 2013-04-30 22:24:48 -04:00
Bradley M. Kuhn
d3c668704c Add <a> tag for donate, for linking later. Use h3. 2013-04-30 22:22:48 -04:00
Bradley M. Kuhn
6632824580 Place percentage in the progress bar. 2013-04-30 22:17:50 -04:00
Bradley M. Kuhn
378d01a422 Fix closing tag. 2013-04-30 22:17:31 -04:00
Bradley M. Kuhn
667a54e045 Remove tab characters. 2013-04-30 22:17:27 -04:00
Bradley M. Kuhn
6e49d079da Create pop-down of text for other donation methods. 
For those methods that require further explanation, configure so that the
text appears upon clicking.
 2013-04-30 22:17:04 -04:00
Bradley M. Kuhn
c723f8885a Add proper fundraising text from internal repository, instead of placeholder. 2013-04-30 22:15:40 -04:00
Bradley M. Kuhn
121203044e Updated progress bar with real numbers; also some layout changes to it as well. 2013-04-30 21:42:47 -04:00
Bradley M. Kuhn
3ef1208e71 Campaign doesn't need to be a template or an application. 2013-04-30 21:14:58 -04:00
Bradley M. Kuhn
4c86f87afb Corrected name of accounting campaign logo image, and add image itself. 2013-04-30 21:11:13 -04:00
Bradley M. Kuhn
bda85a597b Styles should live in CSS, not in the template. 
Properly use nav-bg for campaign.
 2013-04-30 20:01:48 -04:00
Bradley M. Kuhn
b4edbe02f7 Corrected nav-bg files to make appearance accurate on all sizes. 2013-04-30 20:01:13 -04:00
Denver Gingerich
68321f81ad add file missed in 2309ff0 for accounting campaign 2013-04-30 18:06:28 -04:00
Denver Gingerich
2309ff0948 add accounting campaign page; update styles/navbar 2013-04-30 00:13:45 -04:00
Bradley M. Kuhn
414abef67a I'm not so good with the alphabetical order, am I? Lima's *before* Mike. Geez. 2013-04-26 17:38:22 -04:00
Bradley M. Kuhn
7feeab658d Remove errant extra "http://" in the URL. 2013-04-26 16:49:01 -04:00
Bradley M. Kuhn
80c54db504 List Mozilla Foundation as a sponsor. Thanks very much for the donation!! 2013-04-26 16:44:43 -04:00
Bradley M. Kuhn
8a42e844c3 Mozilla Wordmark as sent to me by Matt Thompson. Taken from this URL: 
https://assets.mozillalabs.com/Brands-Logos/Mozilla/mozilla_wordmark.png
and then scaled by GIMP to be within limits for Conservancy's sponsors page.
 2013-04-26 16:43:06 -04:00
Bradley M. Kuhn
0d95d806d7 License was missing for submenu selection. 2013-04-26 16:03:05 -04:00
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
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
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
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
Bradley M. Kuhn
be9ec7c637 Sadly, Google Checkout is now charging fees. 2012-12-10 17:48:12 -05:00
Bradley M. Kuhn
c9a6ca0234 Two typo fixes on sponsors page. 2012-11-30 10:25:46 -05:00
Bradley M. Kuhn
70cb3aff3b Made the URL what appears to be the canonical one used online. 2012-10-25 10:03:56 -04:00
Bradley M. Kuhn
4a3e3cdbf5 Fixed URL for Black Duck. 2012-10-25 09:33:55 -04:00
Bradley M. Kuhn
506bd1dbe1 Updated Google logo to a more recent version, as sent by Google in September. 2012-10-24 13:54:04 -04:00
Bradley M. Kuhn
c3145fece3 Black Duck sent a financial sponsorship to Conservancy. 2012-10-24 13:46:04 -04:00
Bradley M. Kuhn
dd0fd89cf1 Formatting changes. 2012-10-05 15:29:55 -04:00
Bradley M. Kuhn
39cef27975 Add flattr link. to all pages. 2012-10-05 15:29:09 -04:00
Tony Sebro
efc2475b48 edited /Overview page to delete "The"s to harmonize style. 2012-10-05 15:15:03 -04:00
Tony Sebro
1159a89c9d Edited /About page to remove "The" to harmonize style. 2012-10-05 15:13:20 -04:00
Tony Sebro
9db827a123 Updated /donate page to include Flattr button. Deleted a "The" in front of "Software Freedom Conservancy" to harmonize style. 2012-10-05 15:10:23 -04:00
Bradley M. Kuhn
80a73cb605 Corrected Form "990" typo, HT tony 
<tony> bkuhn: FYI, there's a typo on the website.  The links to our IRS
       filings read "Form 900," not "Form 990."    [16:50]
 2012-10-04 16:51:28 -04:00
Bradley M. Kuhn
abd2e6eb1f Grammar fix. 2012-09-29 16:23:59 -04:00
Bradley M. Kuhn
7956d088a6 Just put <a> tag around one word here. 2012-09-25 08:14:18 -04:00
Bradley M. Kuhn
1da8b91fc5 Fixed URL. 2012-09-25 08:13:31 -04:00
Bradley M. Kuhn
9e6245161d Update to include information about second 8868 approval. 2012-09-25 08:11:23 -04:00
Bradley M. Kuhn
859f9ac3f4 note 501(c)(3) here. 2012-09-25 08:08:47 -04:00
Bradley M. Kuhn
cd8edff6eb 2012-02-29 is now a date in the past. 2012-09-09 22:35:31 -04:00
Bradley M. Kuhn
9c4697993e FSA template is now publicly available online. 
This is version is r6334 from Conservancy's internal repository.
FAQ has been appropriately updated to link to this.
 2012-09-03 16:56:37 -04:00
Bradley M. Kuhn
2f94205721 Fixed incorrect verb tense. 2012-09-03 16:44:15 -04:00
Bradley M. Kuhn
4256796e59 Note roughly how many projects are currently waiting. 2012-09-03 16:42:01 -04:00
Bradley M. Kuhn
9050ddc7d6 Update on 10% donation requirement for Conservancy membership. 2012-09-03 16:41:20 -04:00
Bradley M. Kuhn
b508fcd5c4 FAQ entry to explain delays in response. 2012-09-03 16:37:24 -04:00
Bradley M. Kuhn
91ed7fdbc3 Updates and corrections about how the evaluation process currently occurs. 2012-09-03 16:34:51 -04:00
Bradley M. Kuhn
a879cb6b44 Add a bottom margin to leave space after last logo. 2012-08-27 11:01:27 -04:00
Bradley M. Kuhn
c8cb31aa85 Leave even less space between logos on sponsors page. 2012-08-27 11:00:39 -04:00
Bradley M. Kuhn
a02547c4eb Leave less space in between logos. 2012-08-27 10:59:53 -04:00
Bradley M. Kuhn
b068eb5c4e Change to margin-top instead of line-height based on Denver's recommendation. 2012-08-27 10:59:06 -04:00
Bradley M. Kuhn
721b6b3efd Reverting back to center, as Denver and Tony like that better. 2012-08-27 10:55:12 -04:00
Bradley M. Kuhn
a1fdb0a8f5 Denver and Tony say they don't like the border on the li elements in Sponsors page. 2012-08-27 10:52:44 -04:00
Bradley M. Kuhn
643657eb99 After discussion with Denver and Tony, we've concluded that geeks hate target="_blank", 
and geeks are our primary donor base. :)
 2012-08-27 10:49:23 -04:00
Bradley M. Kuhn
40dd4d4577 Fixed URL. 2012-08-27 10:47:25 -04:00
Bradley M. Kuhn
dea7cf4214 Included links to the sponsors pages; using target="_blank" per Tony's suggestion. 2012-08-27 10:46:17 -04:00
Bradley M. Kuhn
9da4ae0968 It was definitely too tall. Also, centered seemed odd. 2012-08-27 10:39:40 -04:00
Bradley M. Kuhn
dff5fe2e6e Attempt to do CSS that makes the sponsors list look nice. 2012-08-27 10:38:06 -04:00
Bradley M. Kuhn
985a0c3765 Added Google, Conservancy sponsor since 2012-06-05. 2012-08-27 10:32:57 -04:00
Bradley M. Kuhn
04eb1b7e8d Actually, just use Linux Foundation logo already seen used online in this nature. 2012-08-27 10:31:29 -04:00
Bradley M. Kuhn
b62a61146c Added Linux Foundation, Conservancy sponsor since 2011-10-14. 
Still waiting for a 250x250 logo image from them.
 2012-08-27 10:29:37 -04:00
Bradley M. Kuhn
3f95f8b17b Added Gandi.Net, a Conservancy sponsor as of 2012-06-27. 2012-08-27 10:27:31 -04:00
Bradley M. Kuhn
31f8c8a203 Too many words. 2012-08-27 10:21:14 -04:00
Bradley M. Kuhn
666e0358f2 Forgot the endblock. 2012-08-27 10:21:09 -04:00
Bradley M. Kuhn
b9c09aa174 Created initial sponsors page. 2012-08-27 10:19:13 -04:00
Bradley M. Kuhn
504247026b Note extension for filing deadline for FY 2012 Form 990 and CHAR-500. 2012-08-23 16:51:10 -04:00
Bradley M. Kuhn
3cbb40f87f Text for Samba description changed at Tridge's request. 2012-07-09 20:49:21 -04:00
Bradley M. Kuhn
d6f375a189 Added GPL Compliance Project for Linux Developers. 2012-05-29 09:54:39 -04:00
Bradley M. Kuhn
75d35b69c9 Note about Conference services. 2012-05-28 10:51:05 -04:00
Bradley M. Kuhn
1fa2a78cbe Merge commit 'refs/merge-requests/3' of git://gitorious.org/conservancy/website into merge-requests/denver 
I originally had those settings that Denver's changed because of a
tutorial I read about handling a sidebar suggested them.  I've accepted
Denver's change, but am concerned that some browsers may not work.
 2012-04-30 11:27:13 -04:00
Denver Gingerich
97024490fb remove 32767px margin/padding values in main CSS 
Several element id's were set to use "padding-bottom: 32767px;" and
"margin-bottom: -32767px;".  This caused element targets (such as
http://sfconservancy.org/about/staff/#denver ) to be rendered poorly
in most browsers, by preventing the user from scrolling up.  Removing
these lines appears to fix the rendering issue with no side effects
(in limited testing of the Staff page).

This change effectively reverts parts of 450ea2c and ed954b7 as the
32767px values were added in those commits.
 2012-04-29 18:27:22 -04:00
Martin Michlmayr
57c0f1bdfd Typo fix 2012-04-05 21:19:25 -07:00
Martin Michlmayr
2a068c17d5 Fix link to Mifos web site 2012-04-05 21:16:52 -07:00
Martin Michlmayr
8f66f4fe85 Cosmetic fix - remove bogus whitespace 2012-04-05 21:15:30 -07:00
Bradley M. Kuhn
53e4a2739b Denver requested a few wordsmith changes to his bio. 2012-03-16 14:14:23 -04:00
Bradley M. Kuhn
88083ec15c Ian and Tom have moved on from the Board, but remain Directors Emeritus 2012-03-16 14:13:04 -04:00
Bradley M. Kuhn
d718f82272 Keep news items a bit longer than previously. 2012-03-08 10:58:09 -05:00
Bradley M. Kuhn
9f799d5d6f jQuery formed its own Foundation. 2012-03-06 11:39:21 -05:00
Bradley M. Kuhn
a0b255ec00 Added Mifos. 2012-03-06 11:39:01 -05:00
Bradley M. Kuhn
1688c69b0f Keep blog posts on front page for 30 days. 2012-02-15 15:13:30 -08:00
Bradley M. Kuhn
d3d6fe19ee Tag fixes. 2012-01-16 09:55:54 -05:00
Bradley M. Kuhn
1ee67c3f26 Removed text. 2012-01-15 16:13:02 -05:00
Bradley M. Kuhn
3cb5c71282 Added FY 2006 CHAR-500 & note why FY 2006 Form 990 wasn't required. 2012-01-15 15:27:40 -05:00
Bradley M. Kuhn
3e96c63a75 Corrected licensing information (HT Martin Michlmayr) 2012-01-15 14:59:11 -05:00
Bradley M. Kuhn
15dc103a3c Fixed year s/2009/2010/g 2012-01-15 14:58:56 -05:00
Bradley M. Kuhn
6ece849161 Conservancy's By-Laws. 2012-01-15 14:20:59 -05:00
Bradley M. Kuhn
62949fb36e Certificate of Incorporation from NYS. 2012-01-15 14:03:47 -05:00
Bradley M. Kuhn
a1bbbd9da7 Added Form 1023. 2012-01-15 14:00:44 -05:00
Bradley M. Kuhn
ca01f3b9b5 FY 2010 filings. 2012-01-15 13:44:15 -05:00
Bradley M. Kuhn
68f0f85021 Wordsmithing based on suggestions by Karen Sandler. 2011-12-22 12:15:03 -05:00
Bradley M. Kuhn
b7764c1bfb Filings page was not properly accounted for in the CSS. 2011-11-04 13:52:37 -04:00
Bradley M. Kuhn
e8b008e412 Restored endblock accidentally removed. 2011-11-04 13:47:12 -04:00
Bradley M. Kuhn
ef0dafebd3 Updated Dan's bio at his request. 2011-11-04 13:44:17 -04:00
Bradley M. Kuhn
fd98d85e73 Added Denver's bio to staff page. 2011-11-04 13:41:24 -04:00
Bradley M. Kuhn
377320b484 Fixed link to Board of Directors page (patch from Martin Michlmayr <tbm@hp.com>) 2011-10-28 10:59:36 +02:00
Bradley M. Kuhn
b884e0176e Corrected number of member projects (patch from Martin Michlmayr <tbm@hp.com>) 2011-10-28 10:58:28 +02:00
Bradley M. Kuhn
8474e49bee Various formatting and punctuation fixes (based on a patch from Martin Michlmayr <tbm@hp.com>) 2011-10-28 10:57:09 +02:00
Bradley M. Kuhn
ba48133e63 The donate page should link to current members list (patch from Martin Michlmayr <tbm@hp.com>) 2011-10-28 10:54:27 +02:00
Bradley M. Kuhn
ec54a32eaf Corrected and updated details about the granting of non-auto FY 2010 Form 900 extension. 
(based on a patch from Martin Michlmayr <tbm@hp.com>)
 2011-10-28 10:50:48 +02:00
Bradley M. Kuhn
2c3f13cb83 Bogus character from bad paste of Peter Brown's bio (patch from Martin Michlmayr <tbm@hp.com>) 2011-10-28 10:44:03 +02:00
Bradley M. Kuhn
3a224ca78e Correct URLs for /about that reference long-since non-existent "team" directory (patch from Martin Michlmayr <tbm@hp.com>) 2011-10-28 10:43:29 +02:00
Bradley M. Kuhn
45770e1964 Remove self-referential link on Board of Directors page (patch from Martin Michlmayr <tbm@hp.com>) 2011-10-28 10:41:42 +02:00
Bradley M. Kuhn
2d3b73f33c punctuation fix on donation page (patch from Martin Michlmayr <tbm@hp.com>) 2011-10-28 10:40:32 +02:00
Bradley M. Kuhn
fb12fb03de hyphenate non-profit (patch from Martin Michlmayr <tbm@hp.com>) 2011-10-28 10:40:01 +02:00
Bradley M. Kuhn
ed4808e5cd Typo fix. 2011-10-27 09:25:32 +02:00
Bradley M. Kuhn
e919f49fbf Added USD. 2011-10-27 09:25:25 +02:00
Bradley M. Kuhn
3a79f17f44 Typo fix. 2011-10-08 10:06:30 -04:00
Bradley M. Kuhn
e051fa0ca7 Added paulv's bio. 2011-09-30 14:09:44 -04:00
Bradley M. Kuhn
6c35d583a7 Fixed link. 2011-09-30 10:57:33 -04:00