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

2094 commits

Author SHA1 Message Date
Martin Michlmayr
49c5bca743 Remove footnote about t-shirt shipment 
Remove footnote since t-shirts are being shipped already.
 2015-03-05 14:26:41 -05:00
Martin Michlmayr
987fd3c102 Remove stale news about match 2015-03-05 14:25:42 -05:00
Martin Michlmayr
2f44797992 A missing word 2015-03-05 14:19:37 -05:00
Martin Michlmayr
9cd9c2b5d0 Fix HTML syntax errors 2015-03-05 14:18:39 -05:00
Bradley M. Kuhn
5eb028235f Shorten questions. 2015-03-05 10:40:26 -08:00
Bradley M. Kuhn
90cf11f1c2 Sure up wording for ambiguous modifier 
HT jackhill for this suggestion.
 2015-03-05 10:39:57 -08:00
Bradley M. Kuhn
bc8ef68559 Correct this: it read the opposite of intended. 2015-03-05 09:51:05 -08:00
Bradley M. Kuhn
a6aad36677 Fix typo in CSS. 2015-03-05 09:41:23 -08:00
Bradley M. Kuhn
5d8db4bcf8 Shorten question. 2015-03-05 09:03:38 -08:00
Bradley M. Kuhn
08dd970a0b Fix donate links. 2015-03-05 08:55:42 -08:00
Bradley M. Kuhn
6b116286d3 Scaled version of image to see if it fits better. 2015-03-05 08:55:38 -08:00
Bradley M. Kuhn
5fec724d62 missing close anchor. 2015-03-05 08:40:20 -08:00
Bradley M. Kuhn
ae329f742d Use PNG for now. 2015-03-05 08:35:28 -08:00
Bradley M. Kuhn
e1d34f476f Fix VMware spelling. 2015-03-05 08:32:26 -08:00
Bradley M. Kuhn
c000d6ae6c Make this string not so long. 2015-03-05 08:31:23 -08:00
Bradley M. Kuhn
0cadef549a Link to press release from menu. 2015-03-05 08:29:46 -08:00
Bradley M. Kuhn
973de8f9ff Fix incorrect HTML tag. 2015-03-05 08:26:24 -08:00
Bradley M. Kuhn
26561835da Supporting docs for announcement of VMware lawsuit 
The VMware lawsuit will be announced publicly momentarily.
 2015-03-05 08:24:45 -08:00
Bradley M. Kuhn
0886c32961 s/Conservancy's/Our/ 
Tony and Karen prefer this.
 2015-03-05 08:02:22 -08:00
Bradley M. Kuhn
3735f65dba s/GPL/GPL Compliance/ in menu 
Karen and Tony prefer this.
 2015-03-05 08:01:48 -08:00
Bradley M. Kuhn
f3b930579f Automatically generate fundraiser percentage text. 
Using this span, we can update the number in the fundraising percentage
text automatically.  The downside is that non-javascript browsers will
not receive a fundraising percentage, but the upside is that fewer
things need to be calculated by hand, and now only the amount raised so
far needs updated.
 2015-03-05 08:00:14 -08:00
Bradley M. Kuhn
3d027ae13c Fix cut-and-paste error in menu selection CSS. 2015-03-05 07:57:17 -08:00
Bradley M. Kuhn
51d69d5f16 Truly remove Overview from the menu. 2015-03-05 07:55:06 -08:00
Bradley M. Kuhn
181d39ac91 This page now has a submenuselection. 2015-03-05 07:54:41 -08:00
Bradley M. Kuhn
47aa505e07 Overview: top level menu -> incorporated in about 
The overview is now incorporated into the About section of the website,
primarily to make more space on the toplevel menubar.
 2015-03-05 07:53:04 -08:00
Bradley M. Kuhn
f635fba970 Properly match category name. 2015-03-05 07:47:41 -08:00
Bradley M. Kuhn
fd3ba703ac Change order on top menu. 2015-03-05 07:46:25 -08:00
Bradley M. Kuhn
66e7c6c251 Shorten longest menu item. 
This menu item was the longest on the top bar.  We need it shorter now
that we just added something else.
 2015-03-05 07:44:23 -08:00
Bradley M. Kuhn
c15ed233cf Begin work to highlight sidebar menu correctly. 
The sidebar menu, and its related top menu item should match setups used
with other sidebar based pages on the site.
 2015-03-05 07:43:41 -08:00
Bradley M. Kuhn
0152099070 That text was too long for this sidebar. 2015-03-05 07:37:08 -08:00
Bradley M. Kuhn
f518115a32 See if making an outer div here fixes formatting. 
This is somewhat of a hack to normalize this to other setups used
elsewhere on the site.
 2015-03-05 07:35:27 -08:00
Bradley M. Kuhn
58b8f22abe Begin templated section about compliance. 
There will be a new area of the website specifically about compliance.
This begins the work to make a templated section about it.
 2015-03-05 07:32:48 -08:00
Bradley M. Kuhn
30241ff42d Rename file about the Linux Compliance project. 2015-03-05 07:13:09 -08:00
Bradley M. Kuhn
b0bd537efd Add IP number as a valid site. 2015-03-05 07:08:15 -08:00
Bradley M. Kuhn
8080ea7525 Restore to real site. 2015-03-04 15:57:26 -08:00
Bradley M. Kuhn
a0dbdb8637 Absolute URL back to /blog for year. 
<tmarble> if you go to http://aspen.sfconservancy.org/blog/
<tmarble> then you click on 2014 in leftnav  [15:46]
<tmarble> you get the new leftnav
<tmarble> BUT the URLS are borked
<tmarble> http://aspen.sfconservancy.org/blog/2014/2015/
<tmarble> http://aspen.sfconservancy.org/blog/2014/2014/
<tmarble> etc.
 2015-03-04 15:48:18 -08:00
Bradley M. Kuhn
fb16e1127d Correct to use pub_date here, not a variable. 2015-03-04 15:43:04 -08:00
Bradley M. Kuhn
c7d4309149 Fix blog by year index. 
Add an additional context data that is always the entire list of years,
and use that instead of date_list for the current queryset.
 2015-03-04 15:40:54 -08:00
Bradley M. Kuhn
9c090f2c27 Correct navigation links. 
Earlier commit incorrectly implemented navigation link suppression when
only one page present, such that this was never shown.  This is now
corrected herein.
 2015-03-04 15:36:25 -08:00
Bradley M. Kuhn
9d654d08ee Restore navigation links. 
Previous commit incorrectly implemented solution for avoiding showing
nav links.  This corrects that.
 2015-03-04 15:35:16 -08:00
Bradley M. Kuhn
5c3a677554 Does look better as h2 2015-03-04 15:33:47 -08:00
Bradley M. Kuhn
855584408b Move blog index to be part of base template. 
This way, it's not on the bottom of pages.  This shouldn't cause
trouble, since when date_list isn't defined, nothing is shown by this
code.
 2015-03-04 15:32:32 -08:00
Bradley M. Kuhn
1c6e685ee4 Remove dead code, no longer needed. 2015-03-04 15:31:05 -08:00
Bradley M. Kuhn
f7425dc802 Only display paginator if multiple pages. 2015-03-04 15:28:44 -08:00
Bradley M. Kuhn
cdf9c67b42 Typo fix from last commit: 
s/extra_content/extra_context/
 2015-03-04 15:25:50 -08:00
Bradley M. Kuhn
1e396f77a3 More extra_context stuff? Put it all in there! 
Simply move the blog_entries field into extra_context and pass the whole
darn thing along to the template.
 2015-03-04 15:24:53 -08:00
Bradley M. Kuhn
8e6c2e54ac date_list should come from the extra_context too. 2015-03-04 15:18:18 -08:00
Bradley M. Kuhn
103ffefc87 Correct variables for setting. 2015-03-04 15:17:31 -08:00
Bradley M. Kuhn
962c180f12 Or, do I mean text-align? 2015-03-04 15:14:28 -08:00
Bradley M. Kuhn
8258ca83f0 Do I need align center for a p tag? 2015-03-04 15:12:50 -08:00
Bradley M. Kuhn
0b530f1139 Only 4 blog entries per page. 2015-03-04 15:12:02 -08:00
Bradley M. Kuhn
c564bb6ac5 Typo fix. 
<tmarble> also blog left nav is borked  [15:11]
 2015-03-04 15:11:36 -08:00
Bradley M. Kuhn
8eda325777 Pagination should float to the center, I think 2015-03-04 15:10:01 -08:00
Bradley M. Kuhn
1ed42c6c89 Must extract paginate_by from kwargs to use it. 2015-03-04 15:07:30 -08:00
Bradley M. Kuhn
b7316e0555 Paginator must be imported if one wants to use it. 2015-03-04 15:06:13 -08:00
Bradley M. Kuhn
8f4c8a69d6 Rework blog's custom_index for new pagination. 
The pagination support changed, and as was previously done a few commits
ago for news, I'm trying a similar solution for blogs.

In this case, I'm trying to use the existing custom_index() method we
have and adapt it to properly support pagination in the way we want.

I'm not completely sure this will work, but I think it's at least close.
 2015-03-04 15:04:13 -08:00
Bradley M. Kuhn
929b381cec Show year only. 2015-03-04 14:46:35 -08:00
Bradley M. Kuhn
e54aff906c This is by year, not by date. 2015-03-04 14:45:56 -08:00
Bradley M. Kuhn
f3eeca0969 reverse date for index of blog posts (HT tony) 2015-03-04 14:43:37 -08:00
Bradley M. Kuhn
c9d97e8f0f Year should be listed, not first day of Jan. 2015-03-04 14:39:35 -08:00
Bradley M. Kuhn
20e258e000 Minor formatting change. 2015-03-04 13:04:44 -08:00
Bradley M. Kuhn
b7e31128a0 Improve pagination links and text in template. 
This should correct various issues with pagination in the press
releases.
 2015-03-04 12:48:54 -08:00
Bradley M. Kuhn
47b446cd3b Correct template path name. 2015-03-04 12:42:42 -08:00
Bradley M. Kuhn
c478c2165b import render_to_response 2015-03-04 12:35:30 -08:00
Bradley M. Kuhn
87c68de62a news_queryset is what we wanted here, not news. 2015-03-04 12:33:12 -08:00
Bradley M. Kuhn
076345298e Allow additional arguments to listing() call. 
The urls setup of old gave us various arguments at call time for
custom_index(), and some where useful.  Hopefully, listing() can support
the same type of system, over time, once adapted.  Here's an attempt to
get it started, first by supporting paginate_by.
 2015-03-04 12:30:54 -08:00
Bradley M. Kuhn
317dd24206 Remove custom_index() method from news view. 
I don't believe custom_index() should be used anymore given that we have
this new listing setup.  At least, that's what I surmise based on
current error messages.  I may bring this back if removing it breaks
something else.
 2015-03-04 12:28:03 -08:00
Bradley M. Kuhn
888d6c3589 Don't just call this "object", say what it is. 2015-03-04 12:23:22 -08:00
Bradley M. Kuhn
00995bff4d Fix cut and paste error from documentation 
This is trying to build a pagination of a news queryset.

HT tmarble for pointing this out.
 2015-03-04 12:22:33 -08:00
Bradley M. Kuhn
5c7710954b Attempt to use Django 1.7 Paginator object. 
Upon reading
  https://docs.djangoproject.com/en/1.7/topics/pagination/#using-paginator-in-a-view

I wonder if we should simply follow this model for pagination of news
items.  I've attempted to adapt that herein.  This is a first attempt
and likely will have issues.
 2015-03-04 12:08:39 -08:00
Tom Marble
f742f86f4b fixed /admin 2015-03-04 19:30:51 +00:00
Tom Marble
86e1646f8f Fixed "(page of)" thing at the top of news 2015-03-03 19:23:57 +00:00
Tom Marble
2bf594b86c First pass at migration to Django 1.7 2015-03-03 18:40:18 +00:00
Bradley M. Kuhn
029ca68386 FOSDEM event is over. 2015-02-13 13:12:48 -05:00
Bradley M. Kuhn
4595ec20e8 1201 Long Form Comment as filed. 2015-02-09 11:08:59 -05:00
Bradley M. Kuhn
eda33642c1 Paragraph about Outreachy in member project list. 
This is as was provided from press release.
 2015-02-04 17:14:44 -05:00
Bradley M. Kuhn
ed270e40c1 Correct bad div in events page: sidebar gone. 2015-01-30 17:07:29 +01:00
Bradley M. Kuhn
1f7772d09a Revert last change: wrong file! 2015-01-30 17:07:21 +01:00
Bradley M. Kuhn
a4a3dfd432 Fix event page formatting from bad div. 2015-01-30 17:04:30 +01:00
Bradley M. Kuhn
983c119c0e Remove side box as well. 2015-01-30 14:34:17 +01:00
Bradley M. Kuhn
9591c15928 No longer allow signup for the dinner tonight. 2015-01-30 14:26:51 +01:00
Bradley M. Kuhn
e3a93bb75d Make it abundantly clear everyone can come. 
Karen got feedback that some people were confused about who can attend.
This change makes it more abundantly clear everyone can attend.
 2015-01-23 17:00:29 -05:00
Bradley M. Kuhn
8ec4e600c5 This should link to the #annual portion. 2015-01-21 15:13:28 -05:00
Bradley M. Kuhn
17a35a345e This is my last attempt to get vertically aligned. 2015-01-20 20:16:55 -05:00
Bradley M. Kuhn
2b352ef63f Fix tag. 2015-01-20 20:14:15 -05:00
Bradley M. Kuhn
eb4fe73074 Seems in the p is better? 2015-01-20 20:13:37 -05:00
Bradley M. Kuhn
c77ee15682 YA attempt to center vertically. 2015-01-20 20:12:21 -05:00
Bradley M. Kuhn
f78374e382 One more attempt to make this look better. 2015-01-20 20:10:42 -05:00
Bradley M. Kuhn
b1906dde34 More hacking to center. 2015-01-20 20:10:01 -05:00
Bradley M. Kuhn
ca597149b6 Quick hack to hopefully center align. 2015-01-20 20:09:00 -05:00
Bradley M. Kuhn
808513a9f1 use div's for sponsor stuff. 2015-01-20 20:06:41 -05:00
Bradley M. Kuhn
cd5e4a9c74 Make this an hr 2015-01-20 20:04:49 -05:00
Bradley M. Kuhn
8905d96f8f This looks better. 2015-01-20 20:04:11 -05:00
Bradley M. Kuhn
f7fef3309c Pull it down a bit on the page. 2015-01-20 20:03:34 -05:00
Bradley M. Kuhn
7b9110ea22 Add Google sponsor at end. 2015-01-20 20:02:47 -05:00
Bradley M. Kuhn
03e82f30c5 Link to annual supporter here. 2015-01-20 18:34:27 -05:00
Bradley M. Kuhn
51d08296f0 Fix quote. 2015-01-20 18:23:36 -05:00
Bradley M. Kuhn
39fad54ede Remove errant email address paste. 2015-01-20 18:22:33 -05:00
Bradley M. Kuhn
5771d6e0a7 Fix accent mark. 2015-01-20 18:21:11 -05:00
Bradley M. Kuhn
c246843ee9 Clarify what existing supporters should do. 2015-01-20 18:20:24 -05:00
Bradley M. Kuhn
57124b5f2f Label as amount per ticket. 2015-01-20 18:10:08 -05:00
Bradley M. Kuhn
f6cb68f50a Change size to make this shorter. 2015-01-20 18:03:28 -05:00
Bradley M. Kuhn
577a4b01f5 br formatting. 2015-01-20 18:02:52 -05:00
Bradley M. Kuhn
5fd4ca8627 Correct title. 2015-01-20 18:02:46 -05:00
Bradley M. Kuhn
a1f9be5e31 Attempt to add quantity. 2015-01-20 17:58:56 -05:00
Bradley M. Kuhn
cb60dd3cd0 Rework RSVP text; increase on-site cost. 2015-01-20 17:00:36 -05:00
Bradley M. Kuhn
f1dae492ba Switch to os2/on2 -- which wasn't used. 2015-01-20 16:52:24 -05:00
Bradley M. Kuhn
88d9072101 Don't list full menu on signup page. 
After much discussion with Tony and tmarble, we've concluded not to put
the menu on the initial page, and instead place it on the thank-you
page, to which PayPal payers are redirected.
 2015-01-20 16:39:48 -05:00
Bradley M. Kuhn
03429d9962 Decrease button size by 25%, per tony. 2015-01-20 16:25:31 -05:00
Bradley M. Kuhn
90d5e5de86 Close paren (HT tmarble) 
<tmarble> (likely vegetarian needs closing paren  [16:17]
 2015-01-20 16:17:37 -05:00
Bradley M. Kuhn
320205b503 Remove additional <br/>'s 2015-01-20 16:17:17 -05:00
Bradley M. Kuhn
b7186cf2e7 Remove (aka Bruxelles) (per tmarble) 
<tmarble>  (aka Bruxelles) is not required  [16:16]
<bkuhn> tmarble: removed
<bkuhn> I put it in only because people might not know.
<bkuhn> (I didn't the first year I attended)
 2015-01-20 16:17:04 -05:00
Bradley M. Kuhn
20d9f1b23e Remove :; CSS is adding it! 2015-01-20 16:16:36 -05:00
Bradley M. Kuhn
656d2ae05b Add supporter night button. 
Thanks to Tony for making it.
 2015-01-20 16:13:26 -05:00
Bradley M. Kuhn
3880c231e4 Minimal dl CSS. 2015-01-20 16:12:04 -05:00
Bradley M. Kuhn
998f5f8dc0 No options here, just amount. 2015-01-20 16:11:58 -05:00
Bradley M. Kuhn
6850a655dc No banner done for this one: 
<bkuhn> tony: also, do you want a banner, ala
        http://sfconservancy.org/img/conservancy-supporter-header.png ?
                                                                        [16:09]
<tony> nah, this is such a short term thing. I don't think it's necessary
 2015-01-20 16:11:49 -05:00
Bradley M. Kuhn
86e780340a First pass at Supporter Night form. 
This is my first pass of the supporter night form with necessary
Javascript and CSS.
 2015-01-20 16:07:19 -05:00
Bradley M. Kuhn
187d3b7183 Annual Supporter RSVP for FOSDEM 2015 event. 
Annual supporters can RSVP for the FOSDEM 2015 event.
 2015-01-20 14:43:05 -05:00
Bradley M. Kuhn
2e3dfdfb92 Fix missing HTML5 proper tag. 2015-01-20 14:42:13 -05:00
Bradley M. Kuhn
21beca5086 FY 2013 Form 990, CHAR 500, and Auditor's report. 
These filings were taken care of by the 2015-01-15 deadline and are
herein presented publicly.
 2015-01-16 20:53:51 -08:00
Bradley M. Kuhn
2bcb073151 Note lexicographical, not alphabetical 2015-01-04 12:34:28 -05:00
Bradley M. Kuhn
dbeada5b0b Ordering likely screwed up when I muck with query. 
Force order_by at the end of my mucking.
 2015-01-04 12:26:25 -05:00
Bradley M. Kuhn
5688ffcd48 Change sort of supporters to be lexicographical. 2015-01-04 12:10:09 -05:00
Bradley M. Kuhn
9a4c92352d Use only on0/os0/on1/os1 options with PayPal. 
According to these URLs:
   https://www.paypal.com/cgi-bin/webscr?cmd=p/xcl/rec/options-help-outside
   https://developer.paypal.com/webapps/developer/docs/classic/paypal-payments-standard/integration-guide/Appx_websitestandard_htmlvariables/

only two Options are supported via PayPal.  I was fooled initially
because other fields *did* come through and *did* show up on the web
interface, but they are *not* accessible via the SOAP interface.

Therefore, I've switched to using the hack described here:
   https://ppmts.custhelp.com/app/answers/detail/a_id/298/kw/soap%20gettransactiondetails%20option

to get 4 fields of data for Supporter transactions.
 2015-01-03 13:14:17 -05:00
Bradley M. Kuhn
71de8fa842 Wording changes and typo fixes for Supporters. 
Update information about who can become a Supporter (small companies
can, too), and make sure they're called "Conservancy Supporters"
throughout.
 2015-01-03 10:03:47 -05:00
Bradley M. Kuhn
e45322d3c9 Place Supporters counter on front & sponsors pages 
The number of current supporters now appears on the frontpage and the
sponsors page.
 2015-01-03 10:02:02 -05:00
Bradley M. Kuhn
f723a74f51 Support anonymous supporter listings by count. 
Remove anonymous listing from the alphabetical supporters list and
instead list them by count found.
 2015-01-03 09:53:44 -05:00
Bradley M. Kuhn
462cbc3963 Supporters list built dynamically. 
Hitherto the supporters list has been committed directly to the static
sponsors/index.html file.  This was never ideal and a quick hack to
build Conservancy's supporters list at the beginning of the supporters
program.

With this change, a Django app now exists that dynamically generates the
supporters list.

The database rows must be built from Conservancy's internal Ledger file,
which will be done in a separate script.
 2015-01-03 09:53:12 -05:00
Bradley M. Kuhn
8e43cfd128 Rename file to template. 
Since we'll produce dynamic content onto this page going forward, this
apparently needs to be in the templates directory now.
 2015-01-03 09:03:20 -05:00
Bradley M. Kuhn
79e238cec0 Add my grandmother, who sent a check. 2014-12-23 16:19:42 -05:00
Bradley M. Kuhn
13bcc6986f Update public ack for last week and a half. 
There needs be to an automated process for this, but there's none yet.
 2014-12-23 12:24:03 -05:00
Bradley M. Kuhn
2a3e2f4d52 List Private Internet Access on the sponsors page. 2014-12-19 19:14:32 -05:00
Karen Sandler
1f1c53a417 PIA logo for sponsors page 2014-12-19 04:12:50 -05:00
Bradley M. Kuhn
fd407312e6 Correct text from previous commit. 2014-12-16 10:56:42 -05:00
Bradley M. Kuhn
1c5ceb4812 Changes as specified by Karen. 2014-12-16 10:28:53 -05:00
Bradley M. Kuhn
8634697621 Fix typo. 2014-12-14 16:19:26 -05:00
Bradley M. Kuhn
98b9e2aa53 We met the match goal. 2014-12-14 16:18:43 -05:00
Bradley M. Kuhn
68d51e036c Correct amount properly not correct in last commit. 2014-12-12 13:50:48 -05:00
Bradley M. Kuhn
d11e722399 Additional supporter. 2014-12-12 13:50:02 -05:00
Bradley M. Kuhn
aaa83650a8 Spelling fix at request of donor. 2014-12-12 13:49:52 -05:00
Bradley M. Kuhn
91cb92cd25 Additional supporters & updates to matching totals. 2014-12-12 11:22:23 -05:00
Bradley M. Kuhn
2657dbf4be Another donor! 2014-12-11 13:40:43 -05:00
Bradley M. Kuhn
57fdb5107d Additional contributor. Good ol' novalis. :) 2014-12-10 13:00:19 -05:00
Bradley M. Kuhn
75425551f9 Additional supporter overnight. 2014-12-10 10:12:40 -05:00
Bradley M. Kuhn
82d87c851b Add Jeremy :) 2014-12-09 16:25:01 -05:00
Bradley M. Kuhn
4be33e71d9 Correct total for proper amount of 2-to-1 match. 
The original total was miscalculated.  Some of the donations weren't
properly counted as 2-to-1.
 2014-12-09 12:29:31 -05:00
Bradley M. Kuhn
5575da61fd Additional monthly payment for Supporter. 2014-12-09 12:17:35 -05:00
Bradley M. Kuhn
e82ed2b7b1 Three additional signups today. 2014-12-09 12:16:35 -05:00
Bradley M. Kuhn
cfc4757938 Fix percentage, HT tmarble. 2014-12-09 09:08:56 -05:00
Bradley M. Kuhn
90a1bda3ea Additional sponsors overnight. 2014-12-09 07:22:55 -05:00
Bradley M. Kuhn
c37383dcfc Add two additional supporters. 2014-12-08 19:17:28 -05:00
Bradley M. Kuhn
60d0a06e25 progressbar Javascript need not change for content 
The content of the amounts for the fundraiser can be kept in the HTML
rather than the progress bar Javscript code.

I suspect at some point I should keep this data in the Django database
and extract it from there as dynamic content.
 2014-12-08 19:15:17 -05:00
Bradley M. Kuhn
bbbface83a Two people joined with match. 2014-12-08 19:07:29 -05:00
Bradley M. Kuhn
5f11ff0c13 Note that possible fix the sidebar scroll. 
Sidebar currently gets bottom cut off when your browser height is too
small.  This URL seems to indicate a fix.  I don't have time to do it
now, but wanted to save it as a note to do later.
 2014-12-08 18:41:28 -05:00
Bradley M. Kuhn
c2c7b9b638 Even more shortening of donate box text. 2014-12-08 18:37:35 -05:00
Bradley M. Kuhn
fa6bf388f9 Shorten text even more. 2014-12-08 18:26:32 -05:00
Bradley M. Kuhn
a92fc7bb4d Shorten text in bar so it scrolls better. 
The text in the bar was a bit too much, it did not scroll well.  I've
shortened the text to fix the problem.
 2014-12-08 18:24:32 -05:00
Bradley M. Kuhn
7b40b231f6 Add image of conservancy-supporter-heart-3x.png. 2014-12-08 17:21:40 -05:00
Bradley M. Kuhn
af5d12f7a1 Rework CSS for "Big News" & add image. 
This image now is displayed with the same background and to the left of
the "Big News".  I spent extensive time researching how best to present
a larger <div> with the grey background and have the image properly
scale beside it.  Ultimately, I couldn't find a better way than this,
and this is hardly optimal.

For example, I looked into wrapping the whole thing in a div, with two
div's inside, and applying various CSS to each to get the image to
properly stay right next to the text and scale in size when resizing of
media made paragraph longer.  This generated even more problems, so I
went with the simpler solution herein, which probably isn't correct and
may well do odd things on different types of media.
 2014-12-08 17:14:52 -05:00
Bradley M. Kuhn
8e22371f19 Progress bar & $5k triple-match program. 
An anonymous donor is matching up to $5k at 2-to-1 for supporter
donations.  Therefore, update the page to include a progress bar for
this, and add notes about it in various places.
 2014-12-08 15:45:58 -05:00
Bradley M. Kuhn
5374ec9573 Additional supporters. 2014-12-08 15:30:08 -05:00
Bradley M. Kuhn
2c22ad9b96 Three additional supporters overnight. 2014-12-05 10:11:15 -05:00
Bradley M. Kuhn
674261e0f0 Start errors in shown state for non-Javascript. 
Since the error messages have important information, and since the
Javascript code is the only "enforcer" of the minimum donation, the
errors really should be displayed by default if the browser is not
Javascript-capable.  This change does that, but also toggles the state
back so that errors are not shown until needed in Javascript-capable
browsers.

I believe this still fits graceful degradation, since browsers without
Javascript and CSS were already showing the errors anyway, so now the
only real change is that everyone sees the errors by default.

It *might* make sense to not show the errors in red in non-Javascript
browsers (i.e., make the default CSS color black for the form-error-show
class, and then change it to red in the Javascript).  I didn't make that
so, because it's not clear to me that's right, and we *do* want to draw
attention to the errors lest people become a supporter below the
minimum (which has happened once already -- that precipitated this
change).

I'm still annoyed that PayPal doesn't provide a "minimum but no maximum"
variable donation box of its own, which would solve this problem
outright.
 2014-12-05 10:07:27 -05:00
Bradley M. Kuhn
0b57b1162d This should really be a class, not an id. 2014-12-05 09:48:04 -05:00
Bradley M. Kuhn
7113da7a43 Merge branch 'master' of gitorious.org:conservancy/website 2014-12-04 19:00:11 -05:00
Bradley M. Kuhn
5d91195dbb Additional supporters. 2014-12-04 18:59:26 -05:00
Martin Michlmayr
6a55036282 Fix some HTML syntax errors 2014-12-04 10:49:39 -05:00
Bradley M. Kuhn
118a41d500 Additional supporters who joined overnight. 2014-12-04 06:40:22 -05:00
Bradley M. Kuhn
0483e33bf8 Additional supporter. 2014-12-03 22:20:54 -05:00
Bradley M. Kuhn
5ce9eb233f Additional supporters. 2014-12-03 21:27:24 -05:00
Bradley M. Kuhn
1574b2dc37 Match right form for these changes. 
The general selectors previously used here matched either form.  With
this change, they will only match the form for which the selection was
actually made.
 2014-12-03 21:09:25 -05:00
Bradley M. Kuhn
2d96daee90 Rework Javascript final form validation. 
The problem before was that an error in the annual form would prevent
submission of the monthly form and vice-versa.  That is herein corrected
with this change, which assures that the input with id of "amount" if
the specific form (id'd with "annual" or "monthly") is the only one
checked.
 2014-12-03 20:44:15 -05:00
Bradley M. Kuhn
9c40bf2e60 supporter-form & support-form-submit: class,not id 
These should be classes, not ids, and the ids should identify whether
it's the monthly or the annual form.
 2014-12-03 20:43:28 -05:00
Bradley M. Kuhn
8c3ecd347a Return amount to id; add id for error span. 
I actually think I want amount to be id rather than a class, now that I
figured out the proper selector to find them all.

Also, the $("span", input.parent()) was buggy if there were any other
span's other than error-related ones in the supporter-form-inputs div.

Finally, ditch that <small> stuff and simply place a font-size reduction
into the CSS for the form-error-show.
 2014-12-03 20:42:33 -05:00
Bradley M. Kuhn
6b9bdb335e Modify PayPal "no_shipping" var via t-shirt choice 
According to
https://developer.paypal.com/docs/classic/paypal-payments-standard/integration-guide/Appx_websitestandard_htmlvariables/

  no_shipping has the following values:
      0: prompt for an address, but do not require one
      1: do not prompt for an address
      2: prompt for an address, and require one
      The default is 0.

Ideally, any time they change wantGift, even in a pure HTML form, we'd
change it between 0 and 2 as appropriate (i.e., we need the address if
they want the t-shirt).

However, I couldn't find an easy way to make this modification in pure
CSS or HTML, so it only happens in Javascript-enabled browsers.

This is still graceful degradation, since the only impact is in cases
where a non-Javascript user fails to give us an address, and we have to
email later to get the shipping address.
 2014-12-03 18:50:53 -05:00
Bradley M. Kuhn
e0f0ee820f Monthly supporter can enter variable amount. 
This required some doing.  I'm not completely sure it works, but I
roughly followed the tutorial available at:
  https://www.paypal.com/webapps/mpp/get-started/create-recurring-donation-button
with back-reference to this:
  https://developer.paypal.com/docs/classic/paypal-payments-standard/integration-guide/Appx_websitestandard_htmlvariables/

My main concern with this setup currently is that 'p3' must be set to
'1', which would seem from the documentation to be saying the payment
will recur only once.  There is a subtle hint via the tutorial that
setting 'src' to 1 will override 'p3' with whatever is found in 'srt',
but that's not said anywhere explicitly that I can find.  So, I'm going
with this and I'll just test it myself with a monthly subscription to
see if it's indefinite (which is the behavior we herein desire).

Finally, note that "amount" is now a class rather than id, since I'm now
using the associated jQuery .on('input') code for both the annual and
monthly amount boxes.
 2014-12-03 18:10:45 -05:00
Bradley M. Kuhn
58f45a556b Typo fix. (HT: pehjota) 2014-12-03 17:44:38 -05:00
Bradley M. Kuhn
342590123f Fix typo. 2014-12-03 16:55:17 -05:00
Bradley M. Kuhn
eea08767d3 Change default to "no t-shirt". 
I suspect some supporters are just accepting the default, so by default,
the t-shirt option will be "No", and supporters will have to
affirmatively chose "Yes".

Thanks to previously committed Javascript hack, users with Javascript
capable browsers should avoid seeing the t-shirt sizing options until
they chose "Yes".
 2014-12-03 16:20:57 -05:00
Bradley M. Kuhn
a61e246db1 Add supporter. 2014-12-03 15:54:03 -05:00
Bradley M. Kuhn
9f1b3710da Add supporter. 2014-12-03 15:31:31 -05:00
Bradley M. Kuhn
83cfcfacfb Corrected endblock. 2014-12-03 14:27:47 -05:00
Bradley M. Kuhn
bc5f1b6c63 Add another supporter. 2014-12-03 14:26:55 -05:00
Bradley M. Kuhn
08275e0cbb Another supporter. 2014-12-03 14:19:01 -05:00
Bradley M. Kuhn
3256391c99 Remove male dominated placeholder. 2014-12-03 13:49:06 -05:00
Bradley M. Kuhn
f1c46c481d Move support higher up. 2014-12-03 13:48:09 -05:00
Bradley M. Kuhn
33025998fb Shorten title, reword information. 2014-12-03 13:47:50 -05:00
Bradley M. Kuhn
50cf881501 Add supporter program to front page. 2014-12-03 13:46:44 -05:00
Bradley M. Kuhn
27276109ad Add copyleft.org and NPO Acct to "Learn more" link 2014-12-03 13:46:29 -05:00
Bradley M. Kuhn
093400150a Create a new update. 2014-12-03 13:41:24 -05:00
Bradley M. Kuhn
7fec31ce8a Hide t-shirt size selector when t-shirt's unwanted 
Use Javascript to hide the t-shirt size selector when the the user
selects "No" for "Do you want a t-shirt?".  Reshow it (and make sure
it's shown by default) for "Yes".
 2014-12-03 13:33:26 -05:00
Bradley M. Kuhn
fcbb3b5085 Supporter means /supporter/ now, so change this. 2014-12-03 13:16:40 -05:00
Bradley M. Kuhn
d737a5e567 Correct typo. 2014-12-03 13:14:48 -05:00
Bradley M. Kuhn
08f45ac79b Skip more space here. 2014-12-03 13:11:34 -05:00
Bradley M. Kuhn
3ae6bbd937 These should be h2 headings. 2014-12-03 12:51:21 -05:00
Bradley M. Kuhn
0ef0fdf43f Note that the logos are the sponsors. 2014-12-03 12:36:53 -05:00
Bradley M. Kuhn
e926570ec5 Link to the public list. 2014-12-03 12:34:53 -05:00
Bradley M. Kuhn
2a470bc7cc <hr> is really needed here. 2014-12-03 12:34:43 -05:00
Bradley M. Kuhn
6bf2340453 Add first three supporters to sign up. 2014-12-03 12:29:29 -05:00
Bradley M. Kuhn
ba50cd0232 SVG bullet list of supporters on sponsors page. 
This CSS, which I discovered from extensive research online, should work
to create a bulleted list with the bullets being the heart-shaped
Conservancy logo.
 2014-12-03 12:29:24 -05:00
Bradley M. Kuhn
ece5b2581b Add missing close brace. 2014-12-03 12:27:32 -05:00
Bradley M. Kuhn
04d927961d Rework page so that it can include supporters too. 2014-12-03 10:57:10 -05:00
Bradley M. Kuhn
8ce79c7efd Put hr tag inside this div to inherit properties. 2014-12-03 09:58:52 -05:00
Bradley M. Kuhn
b9b4695f97 Match width and alignment to donate-content class. 2014-12-03 09:58:07 -05:00
Bradley M. Kuhn
5014455930 Remove http://sfconservancy.org; this is that site 2014-12-03 08:46:58 -05:00
Bradley M. Kuhn
c24285c461 Links to project websites. 2014-12-03 08:45:01 -05:00
Bradley M. Kuhn
81a73acec4 Shorten text. 2014-12-02 20:57:46 -05:00
Bradley M. Kuhn
ee7125fd31 Full name of this project, and a link. 2014-12-02 18:31:13 -05:00
Bradley M. Kuhn
f042c375be Use em padding here, and a little less of it. 2014-12-02 18:30:15 -05:00
Bradley M. Kuhn
8291c3db2e Reword text again. 2014-12-02 18:29:06 -05:00
Bradley M. Kuhn
b6b94e3206 Clarify no benefits received until 12 months. 2014-12-02 18:27:22 -05:00
Bradley M. Kuhn
44301d386b Correct Markdown-style footnote w/ HTML style one. 
This footnote is now correctly formatted in HTML, with links back and
forth, as well as a jQuery UI tooltip popup for the footnote.
 2014-12-02 18:25:42 -05:00
Bradley M. Kuhn
c41a897be2 Simply clear error for monthly donation. 
Since the error messages relate only to the amount entered, the error
message should be cleared when switching to the monthly giving option.
 2014-12-02 18:02:32 -05:00
Bradley M. Kuhn
c546833984 Amount starts class "valid", when default accepted 
The default amount of $120 appears in the amount field, but the class
"valid" was usually only added when the user changes the amount.

The valid class must be added at the start to ensure someone simply
clicking with the default still can donate.
 2014-12-02 17:58:39 -05:00
Bradley M. Kuhn
9aa9e73a91 600px seems better here than 500px. 2014-12-02 17:55:06 -05:00
Bradley M. Kuhn
009cc20555 Avoid donate-sidebar on small screens. 
The donate-sidebar overlaps with text on small screens.  This problem is
corrected herein by using @media for 500px screens to remove display of
the sidebar.
 2014-12-02 17:51:32 -05:00
Bradley M. Kuhn
dbe8d4f238 Remove hard-coded style= for donate-sidebar div 
Move the CSS for the donate-sidebar into the conservancy.css file
instead of hard-coding in the HTML.
 2014-12-02 17:51:10 -05:00
Bradley M. Kuhn
19ef9d196b Fix missing trailing newline. 2014-12-02 17:49:20 -05:00
Bradley M. Kuhn
1b96df2224 Use em here so that the button is a bit closer. 2014-12-02 17:49:10 -05:00
Bradley M. Kuhn
3dd381cddb Make error text even shorter. 2014-12-02 17:35:31 -05:00
Bradley M. Kuhn
8fbf7ba2b0 Reword text. 2014-12-02 17:34:08 -05:00
Bradley M. Kuhn
0d0f7707e9 This must be below the second div. 2014-12-02 17:32:39 -05:00
Bradley M. Kuhn
090fb9f268 Larger error message when submitting bad amount. 
This addition to the Javascript and text ensures a clear message to the
user of a Javascript-enabled browser that there is an issue with the
amount.  Also, it prevents submission of the form until the amount is
correct.

A user with Javascript disabled can circumvent these validation steps;
however, the worst-case scenario is that they make a donation for less
than $120 that is categorized in Conservancy's internal system as a
Supporter donation, and we'll be adding internal checks to find that.
 2014-12-02 17:26:55 -05:00
Bradley M. Kuhn
b2c18cc59e Correct regular expression and comma thing fully. 
parseInt() likely wants no commas, so we use a value without it, and the
regular expression now seems to properly match was PayPal will take as
valid.
 2014-12-02 17:04:05 -05:00
Bradley M. Kuhn
3438812e00 Maybe comma need not be escaped? 2014-12-02 16:28:46 -05:00
Bradley M. Kuhn
8b16abf981 PayPal seems to be ok with commas. 2014-12-02 16:27:37 -05:00
Bradley M. Kuhn
403c884489 Add alt text. 2014-12-02 16:21:16 -05:00
Bradley M. Kuhn
6e3468bc98 Modify CSS, image & related so img of heart works. 
Putting the heart on the floated right corner should work pretty well
now with this CSS.
 2014-12-02 16:20:10 -05:00
Bradley M. Kuhn
34648758b0 Allow scaling of photo. 2014-12-02 16:15:03 -05:00
Bradley M. Kuhn
870d25d9e3 Force scaling of width for banner. 
The banner should scale with the width of the window.
 2014-12-02 16:11:36 -05:00
Bradley M. Kuhn
aa0f8b1c74 Apparently, we aren't using this now. 
<tony> bkuhn, karen:  so, let's not bother using the logo-heart. The pic adds
       enough visual interest.  Now, what about the the text header.  Do you
       want it to be a smidgen smaller?
 2014-12-02 15:57:49 -05:00
Bradley M. Kuhn
d78052f25e Correct img tag. 2014-12-02 15:41:54 -05:00
Bradley M. Kuhn
fca6ed8229 Conservancy Supporter headers & their placement. 2014-12-02 15:40:46 -05:00
Bradley M. Kuhn
8c653e884f URL changes for successful supporter redirection. 2014-12-02 15:31:07 -05:00
Bradley M. Kuhn
667118755c Thank-you page to redirect supporters post-payment 
This page is now set as part of the PayPal giving forms to redirect
supporters to after they've paid.
 2014-12-02 15:30:02 -05:00
Bradley M. Kuhn
627befe0b3 Another adjustment to the forms CSS. 
This is working on my test site but not on the main website.  I can't
figure out why.
 2014-12-02 14:14:31 -05:00
Bradley M. Kuhn
1328b725b1 Attempt to correct image CSS. 2014-12-02 14:13:12 -05:00
Bradley M. Kuhn
8bfe2e16f4 Add image from Karen of t-shirt. 2014-12-02 14:08:26 -05:00
Bradley M. Kuhn
fa29e1b8f3 Customized buttons for annual/monthly supporter. 
These buttons were drawn by Tony and replace the default PayPal buttons.
 2014-12-02 13:41:04 -05:00
Bradley M. Kuhn
b90413809f Subscriptions for monthly supporters. 
There are now two options at the bottom of the page, annual and monthly
supporters.

In addition, there is Javascript code to cause the annual and monthly
items disappear and reappear upon selection either in the donate box or
the selector above the items.

I tested this in links and it seems to degrade reasonably well.
 2014-12-02 13:35:53 -05:00
Bradley M. Kuhn
15b3cbb273 Better alt text and incorrectly placed </div> 2014-12-02 12:11:36 -05:00
Bradley M. Kuhn
194f95d016 Float Donate button to the center beside questions 
The donate button is now centered beside the questions that relate to
the supporter program.
 2014-12-02 12:09:43 -05:00
Bradley M. Kuhn
4003c1b8c9 Better formatting for submit button. 
The needed CSS is already in forms.css
 2014-12-02 12:00:18 -05:00
Bradley M. Kuhn
6aff0260a0 Correct various HTML formatting issues. 2014-12-02 11:57:42 -05:00
Bradley M. Kuhn
83dd8a3fbd Remove stray end tag. 2014-12-02 11:55:06 -05:00
Bradley M. Kuhn
6d365d77ed Make this text a bit shorter. 2014-12-02 11:53:49 -05:00
Bradley M. Kuhn
9bfb5e10de Rework form with error messages & basic validation 
Since PayPal cannot seem to be cajoled into verifying a minimum amount,
we have to do it here with Javascript.  This isn't perfect validation:
the form can currently still be submitted with an amount less than $120,
but at least this way Javascript-enabled browsers might prevent some
folks from doing that.
 2014-12-02 11:31:43 -05:00
Bradley M. Kuhn
01eb8c80c8 Move javascript code from HTML files to a .js file 2014-12-02 11:28:37 -05:00
Bradley M. Kuhn
a9d63616d3 Updated jQuery to 1.11.1 and jQuery UI to 1.11.2 2014-12-02 11:22:39 -05:00
Bradley M. Kuhn
449a6c6749 Change form type to make $120 auto work. 2014-12-01 20:19:43 -05:00
Bradley M. Kuhn
a542a92937 Does this work better without _s thing? 2014-12-01 19:06:32 -05:00
Bradley M. Kuhn
76479769d4 Attempt to fix amount not coming through. 2014-12-01 18:45:29 -05:00
Bradley M. Kuhn
ea23feebfa Shorten lines. 2014-12-01 18:35:31 -05:00
Bradley M. Kuhn
aa7321a34d os3 not coming through to PayPal;Will this fix it? 2014-12-01 18:33:50 -05:00
Bradley M. Kuhn
fdbdedd8fb Fix npoacct menu selection highlight. 2014-12-01 14:59:45 -05:00
Bradley M. Kuhn
ba612c1ed6 Remove thank-you URL for now. 2014-12-01 13:57:01 -05:00
Bradley M. Kuhn
b5a7c9ecda Make supporter page live on the menu. 2014-12-01 13:56:44 -05:00
Bradley M. Kuhn
92be0bbb90 Remove ! from this sentence, per karen: 
<karen> I would take the exclamation point off of "Support us via PayPal or
        credit card!"  [13:55]
 2014-12-01 13:55:19 -05:00
Bradley M. Kuhn
432c868ae5 Change ids. 2014-12-01 13:51:42 -05:00
Bradley M. Kuhn
c5830136f9 Add Become a supporter. 2014-12-01 13:50:12 -05:00
Bradley M. Kuhn
a3516ffa60 Fix Donate now. 2014-12-01 13:48:55 -05:00
Bradley M. Kuhn
4ddb1051c8 Fix anchor failed close with > 2014-12-01 13:47:27 -05:00
Bradley M. Kuhn
6053651442 Various fixes for amount box. 2014-12-01 13:46:55 -05:00
Bradley M. Kuhn
ce87be9291 More links to donate-box flash. 2014-12-01 13:44:54 -05:00
Bradley M. Kuhn
aec0f8080e Rework text on form. 2014-12-01 13:44:47 -05:00
Bradley M. Kuhn
47345eae95 Add link to donate box. 2014-12-01 13:43:43 -05:00
Bradley M. Kuhn
47ebde2bdc Fix anchor. 2014-12-01 13:41:38 -05:00
Bradley M. Kuhn
1d2cabdde8 Add heading. 2014-12-01 13:41:34 -05:00
Bradley M. Kuhn
873ced992a Move donate link to bottom; link to from sidebar. 2014-12-01 13:38:17 -05:00
Bradley M. Kuhn
00b0576bbb Add show/hide javascript as used for npoacct. 2014-12-01 13:38:08 -05:00
Bradley M. Kuhn
7276f0e17c Fix various problems with amount box. 2014-12-01 13:29:42 -05:00
Bradley M. Kuhn
448f1b02ef Rework form to make it fit better. 2014-12-01 13:25:25 -05:00
Bradley M. Kuhn
6275e3e377 Add missing npoacct selection box. 2014-12-01 13:13:04 -05:00
Bradley M. Kuhn
694e773ee5 Add Django templating and donation box. 2014-12-01 13:11:36 -05:00
Bradley M. Kuhn
ae1bbf964b Initial draft of supporter page. 2014-12-01 13:02:02 -05:00
Bradley M. Kuhn
8e728d010c Campaign is no longer "campaign", but npoacct. 
Changes in preparation of launching supporter program; no longer
highlight this as the "campaign".
 2014-12-01 13:01:06 -05:00
Bradley M. Kuhn
ce76203321 Rename file to new directory. 
/campaign will now be redirected to npoacct in apache config.
 2014-12-01 12:57:21 -05:00
Martin Michlmayr
15bd2a9add Fix some HTML syntax errors 2014-11-11 18:03:03 -05:00
Martin Michlmayr
82c58e3758 HTML tag "acronym" has been replaced by "abbr" in HTML5 2014-11-11 18:00:29 -05:00
Martin Michlmayr
1909b80564 Convert img border to CSS via style 2014-11-11 18:00:02 -05:00
Martin Michlmayr
fffb27d71d Use HTML5 2014-11-01 11:33:25 +01:00
Bradley M. Kuhn
3507839c63 Rename file names to remove the word "draft". 
RedirectPermeant's have been added server-side to handle the fact that
the URLs were already live.
 2014-10-31 13:06:39 -04:00
Bradley M. Kuhn
023ceb3435 Fix formatting error that Tony corrected. 2014-10-31 12:41:38 -04:00
Bradley M. Kuhn
5228b0a867 Update to versions with the Letterhead. 2014-10-31 12:39:15 -04:00
Bradley M. Kuhn
e6bfa35ad1 Updated to add CC0 waiver in it. 2014-10-31 12:37:24 -04:00
Bradley M. Kuhn
f58126eecd Rename file to no letterhead version, 
letterhead version is coming shortly.
 2014-10-31 12:30:08 -04:00
Bradley M. Kuhn
186819ccfb Add DMCA Petition files, as they were filed today. 2014-10-31 12:24:45 -04:00
Martin Michlmayr
7871c5e7a9 Cosmetic fix 2014-10-30 18:10:49 +01:00
Martin Michlmayr
44a6e3a6b4 Add Martin Michlmayr as Assistant Treasurer 2014-10-30 17:55:21 +01:00
Martin Michlmayr
38944d3bb4 Remove Loïc Dachary from the eval committee 
Loïc is on a leave of absence from the eval committee.
 2014-10-30 17:29:41 +01:00
Martin Michlmayr
abb606c99a Remove Loïc Dachary as Director 
Loïc resigned due to lack of time but hopes to return in the future.
 2014-10-30 17:26:09 +01:00
Martin Michlmayr
74e0db77f9 Update filing date for FY 2013 2014-10-22 19:57:29 -04:00
Martin Michlmayr
66b2dcb958 Add FY 2014 2014-10-05 20:40:18 -04:00
Martin Michlmayr
78a5af62d6 Update FY 2013 filing status 2014-10-05 20:38:31 -04:00
Martin Michlmayr
a6d8735044 Fix HTML syntax error 2014-10-05 19:30:32 -04:00
Martin Michlmayr
28bcd2bf2d Add LuxRender 2014-10-05 19:09:03 -04:00
Bradley M. Kuhn
c463114b6b Mark Galassi is now Board Chairperson. 2014-09-15 17:09:36 -04:00
Martin Michlmayr
5ef2da5c39 Add Martin Michlmayr to the board page 2014-09-15 16:26:54 -04:00
Bradley M. Kuhn
12da2f4229 Update to current amounts. 2014-08-12 18:23:48 -04:00
Bradley M. Kuhn
328a972416 Merge upstream change w/ my change to donate page 2014-07-30 13:10:51 -04:00
Bradley M. Kuhn
7538e2881e Update Monthly Donation form to fix PayPal problem 
On a monthly subscription box, PayPal silently fails to allow the user
to select any option but the first one (despite selecting another value
from the form) if you name the values the same.

It's somewhat obvious when you review the form code that PayPal gives
you that all the value="" fields were the same, and thus the incorrect
behavior is somewhat unsurprising.

I fixed this by modifying the buttons to include the amount in words.
 2014-07-30 13:08:03 -04:00
Martin Michlmayr
611b14240a Update bio of Martin Michlmayr 2014-07-16 14:56:45 -04:00
Martin Michlmayr
ca961add01 Reduce whitespace/linebreaks in HTML output 2014-07-16 13:35:35 -04:00
Martin Michlmayr
6c75aa824d Use same logic for blogs as for news 
Put the code for blog.1 within the if block of blog.0, as this is the
logic used for news.  As a result, the <hr> divider for blogs is now
in the "shaded" element (as it already is with news).
 2014-07-15 18:30:25 -04:00
Martin Michlmayr
4802759d06 Put "Conservancy Blog" heading in shaded element for consistency with news 2014-07-15 18:27:24 -04:00
Bradley M. Kuhn
55d84a19b1 .* no longer desirable in /admin in urls.py 
According to:
http://stackoverflow.com/questions/10145583/django-1-4-and-noreversematch-at-admin-error

the .* was no longer correct.  It is herein removed.
 2014-07-14 14:49:17 -04:00
Bradley M. Kuhn
835d482604 No longer "stash" the GET object in self. 
I don't think this was actually necessary ultimately.  I think the older
code, herein removed, in item_author_email() was wrong-headed in the
first place, or at the very least, was overkill.

Each item has a distinct author, according to the BlogEntry model.  So,
I think this is actually what we want.  I noticed the author filed isn't
properly going into the RSS at the moment anyway, but I'm somewhat past
caring about that, as long as the URLs now work to get author- and tag-
specific feeds.
 2014-07-14 14:39:10 -04:00
Bradley M. Kuhn
387275c9d4 GET object is accessible everywhere in BlogFeed. 
This solution is likely a hack to ensure the GET object is regularly
accessible.
 2014-07-14 13:10:23 -04:00
Bradley M. Kuhn
e75642ed47 use get_object() in BlogFeed to get request object 
Upon reading
https://docs.djangoproject.com/en/dev/ref/contrib/syndication/#a-complex-example

I think that this is what I need to do to forward-port this Django 1.2
to Django 1.4's Feed objects.
 2014-07-14 12:35:08 -04:00
Bradley M. Kuhn
2a572dcffa Fix regression introduced in commit early today. 
6a2918c288 introduced a removal of this
line.  This line is necessary for the front page to work.
 2014-07-14 12:08:53 -04:00
Bradley M. Kuhn
252f29af81 Make sure return values match title. 
I received this error from the feeds:

AttributeError at /feeds/news/

'PressRelease' object has no attribute 'title'

Request Method: 	GET
Request URL: 	http://sfconservancy.org/feeds/news/
Django Version: 	1.4.5
Exception Type: 	AttributeError

'PressRelease' object has no attribute 'title'
Exception Location: 	/var/www/conservancy/feeds.py in item_title, line 46

I think this change fixes that.
 2014-07-14 11:56:30 -04:00
Bradley M. Kuhn
527ad3087f Additional argument was likely incorrect. 
Rereading https://docs.djangoproject.com/en/1.4/ref/contrib/syndication/
shows that the first argument should no longer be that class.
 2014-07-14 11:49:03 -04:00
Bradley M. Kuhn
61476fdb5c First attempt to follow Django 1.4 feed classes. 
I followed the instructions at
https://docs.djangoproject.com/en/1.4/ref/contrib/syndication/
and attempted to get these feeds to match that one.
 2014-07-14 11:03:54 -04:00
Bradley M. Kuhn
10b785b04d Need to import these classes for urls to use them. 2014-07-14 10:55:58 -04:00
Bradley M. Kuhn
2c63f6b33e Try putting these settings in each class. 
I am not sure what the loop was for anyway.
 2014-07-14 10:54:25 -04:00
Bradley M. Kuhn
18addfe969 Additional issues deal with feed_dict deprecation. 2014-07-14 10:52:41 -04:00
Bradley M. Kuhn
6a2918c288 In Django 1.2, feed_dict was deprecated. 
Therefore, change this to use the method explained at:

https://docs.djangoproject.com/en/dev/releases/1.2/#feed-in-django-contrib-syndication-feeds
 2014-07-14 10:49:29 -04:00
Bradley M. Kuhn
f18e922cf8 Merge branch 'master' of gitorious.org:conservancy/website 2014-07-14 10:22:44 -04:00
Bradley M. Kuhn
7835493122 Apparently, "Feed" is now capitalized. 
http://stackoverflow.com/questions/6642829/how-to-resolve-could-not-import-django-contrib-syndication-views-feed-error-in
 2014-07-14 10:20:15 -04:00
Martin Michlmayr
6dcb45d412 Update number of member projects 2014-07-09 16:43:01 -04:00
Bradley M. Kuhn
d70e6f3f8b Update for Djnango 1.4.5: admin.site.urls 
http://stackoverflow.com/questions/5503616/how-to-correct-this-error-adminsite-object-has-no-attribute-root
 2014-07-08 13:33:06 -04:00
Bradley M. Kuhn
85e9253eec Update for Djnango 1.4.5: feeds import. 2014-07-08 13:25:48 -04:00
Bradley M. Kuhn
639860b6e0 Fix alphabetical order problem from last commit. 2014-07-04 10:29:44 -04:00
Bradley M. Kuhn
b1a18a5aec Kallithea is Conservancy's newest member project. 
See http://sfconservancy.org/news/2014/jul/04/kallithea-joins/ for the
full announcement.
 2014-07-04 10:26:01 -04:00
Bradley M. Kuhn
0f00a679a4 Update progress & note it's only updated monthly. 
I've not been on top of updating this, but I'll usually do it at least
monthly now.
 2014-07-04 10:25:21 -04:00
Bradley M. Kuhn
865a56a6d6 Better spacing between donation types. 2014-06-13 08:15:05 -04:00
Bradley M. Kuhn
77f6c9ffa3 Better instructions and detail about wire transfer donations. 2014-06-13 08:13:33 -04:00
Tony Sebro
ee30bcb2bf updated outside counsel list to include Pam Chestek. 2014-05-29 18:15:29 -04:00
Bradley M. Kuhn
8dd4396a59 Karen is an employee now. 2014-05-05 13:27:25 -04:00
Martin Michlmayr
350bdfa106 Move the hr into the shaded div 
Move the hr into the shaded div, as is already the case with news.
 2014-05-02 12:27:13 -04:00
Martin Michlmayr
cb8f62370d Fix HTML </div> error on frontpage 
One too many <div> elements were closed when no blogs were displayed.

Note that the logic between news and blogs is different: news opens
one "shaded" div and puts all news in it.  In the case of blogs, one
"shaded" div is created for each blog entry displayed.
 2014-05-01 19:27:04 -04:00
Bradley M. Kuhn
de0b3fbb09 Include donations in progress bar through 2014-04-20. 
mjw insisted that I update this more often; he's right about that. :)
 2014-04-30 11:15:06 -07:00
Bradley M. Kuhn
24a8201313 Updates to the FSA template from Conservancy's internal repository. 
Included is now the ODT version of the template, that Tony and Karen insisted
on. :)
 2014-04-24 11:29:13 -04:00
Bradley M. Kuhn
9e7875d5d7 Update Karen's Bio on Eval Committee page as well. 2014-04-23 13:20:41 -04:00
Martin Michlmayr
c0bf257532 Close mainContent <div> element 2014-04-17 19:07:13 -04:00
Martin Michlmayr
cc031b3b61 Fix syntax for HTML comment 2014-04-17 19:01:51 -04:00
Martin Michlmayr
5456654ed2 Fix number of current projects 2014-04-17 13:07:29 -04:00
Martin Michlmayr
80392225ca Use HTML element for ampersand 2014-04-17 13:04:05 -04:00
Martin Michlmayr
e4a92f8bab Use American English for consistency 2014-04-17 12:54:13 -04:00
Martin Michlmayr
d7ace48349 Use Conservancy instead of SFC for consistency 2014-04-17 12:54:08 -04:00
Martin Michlmayr
ce2eeafb29 Fix HTML error - opening element used to close paragraph 2014-04-17 12:53:47 -04:00
Martin Michlmayr
e37dc9ceae Fix use of <p> in relation to <ul> 2014-04-17 12:53:35 -04:00
Martin Michlmayr
6e8d7dd68a Add missing </a> 2014-04-17 12:53:29 -04:00
Martin Michlmayr
5b627813e4 Fix error ID "sponsor" already defined 
An id can only be used once, you'd have to use a "class", but since the
<ul> element has an id the individual list elements will get the right
CSS values.
 2014-04-17 12:53:21 -04:00
Martin Michlmayr
46e66f42af Remove empty list element 2014-04-17 12:53:00 -04:00
Bradley M. Kuhn
f2e173d19e Update my bio. 2014-04-02 08:12:30 -04:00
Bradley M. Kuhn
14ae2f83ae Update to Karen's bio, as she emailed to me last night. 2014-04-02 08:01:32 -04:00
Bradley M. Kuhn
40c267daa1 Revert that last one, that's not the right way to do this. 2014-03-31 18:46:16 -04:00
Bradley M. Kuhn
c2a1250eac Put the time in 24 hour notion. 2014-03-31 18:44:05 -04:00
Bradley M. Kuhn
09d7a3aa2c Remove <br>'s, extra line, and fix variable name. 2014-03-31 18:41:43 -04:00
Bradley M. Kuhn
f3548d51a0 Rework how blog authors appear. 2014-03-31 18:39:35 -04:00
Bradley M. Kuhn
d66597edeb Fix div's, I think. 2014-03-31 18:36:21 -04:00
Bradley M. Kuhn
d24d3763b3 Improve template for blog when two appear. 2014-03-31 18:34:01 -04:00
Bradley M. Kuhn
f9eaefc173 Updated my bio. 2014-03-31 10:22:09 -04:00
Bradley M. Kuhn
00355badf7 Correct my title. 2014-03-31 10:16:01 -04:00
Bradley M. Kuhn
4519cfe1a3 Update Karen's bio. 2014-03-31 10:02:26 -04:00
Bradley M. Kuhn
a34a6dd73f Karen Sandler is now Executive Director. 
Also, update her bio to note she's not at GF anymore.
 2014-03-31 10:00:28 -04:00
Bradley M. Kuhn
068aa9ae7e David Marin and Amanda Halpin sponsorship. 2014-03-10 12:54:39 -04:00
Bradley M. Kuhn
28b11c9b11 Amarok left Conservancy officially today. 2014-02-28 09:33:19 -05:00
Bradley M. Kuhn
5bc1f84a77 Updated based on this week's donations. 2014-02-28 09:32:21 -05:00
Bradley M. Kuhn
3964c3e91f Add elections to Conservancy's list of member project services. 2014-02-27 11:51:47 -05:00
Bradley M. Kuhn
b04bb89f0f Update based on recent donations. 2014-02-26 09:00:29 -05:00
Bradley M. Kuhn
6218d22b9c Make a small PNG file for use in GSoC 2014. 2014-02-13 19:17:08 -05:00
Bradley M. Kuhn
620ec59177 FY 2012 Annual Report. 2014-01-29 17:55:45 -05:00
Bradley M. Kuhn
823907e67c FY 2012 Form 990, 990-T, CHAR-500 and auditors' report. 2014-01-14 19:57:21 -05:00
Bradley M. Kuhn
d6734debbf Updated number to current donation amounts. 2013-12-31 10:42:50 -05:00
Bradley M. Kuhn
e357a9f7eb Monthly donation. 2013-12-17 21:35:09 -05:00
Bradley M. Kuhn
0e4e179be8 Add monthly donation option. 2013-12-17 21:33:01 -05:00
Bradley M. Kuhn
89f09a40cd Note stock donation possibility. 2013-12-17 21:32:49 -05:00
Bradley M. Kuhn
b4edc163d0 Move flattr link to bottom of page. 2013-12-17 21:32:34 -05:00
Bradley M. Kuhn
4297294546 Correct donate line; reword text slightly. 2013-12-17 09:23:53 -05:00
Bradley M. Kuhn
dcd7e50659 Link to donate on the same page. 2013-12-17 09:20:35 -05:00
Bradley M. Kuhn
30de6b6930 Add javascript for donate box. 2013-12-17 09:19:05 -05:00
Bradley M. Kuhn
d9f1d9b840 W3C Validator says type= is required. 2013-12-17 09:15:03 -05:00
Bradley M. Kuhn
3e845e84f5 Fix tags and add <a> for donate. 2013-12-17 09:12:44 -05:00
Bradley M. Kuhn
2649c84625 Fix classifications for Django. 2013-12-17 09:07:33 -05:00
Bradley M. Kuhn
79d48bd96a Add missing period. 2013-12-17 09:06:29 -05:00
Bradley M. Kuhn
512bf5ce7d Fix closing tags and such. 2013-12-17 09:05:45 -05:00
Bradley M. Kuhn
c9c5c85c1c Add floating Donate box like the campaign page has. 2013-12-17 09:02:34 -05:00
Bradley M. Kuhn
cf0e2c12d4 Don't use fully qualified URL for our own site. 2013-12-17 08:58:54 -05:00
Bradley M. Kuhn
5f3048622f Fix unclosed <a> tag. 2013-12-17 08:58:20 -05:00
Bradley M. Kuhn
59054724bb Add long-overdue description page for GPL Compliance Project for Linux Developers. 2013-12-17 08:56:59 -05:00
Bradley M. Kuhn
f7f6f2b9a0 Forgot to remove Google Checkout from campaign page. 2013-12-06 17:45:56 -05:00
Bradley M. Kuhn
6e934f9439 OpenTripPlanner has joined Conservancy! 2013-11-22 11:29:20 -05:00
Bradley M. Kuhn
e153e3dbcb Updated to 30 members per yesterday's announcement. (HT tbm) 2013-11-21 11:58:08 -05:00
Bradley M. Kuhn
413b280e01 Buildbot has joined Conservancy! 2013-11-19 18:06:55 -05:00
Bradley M. Kuhn
ffe1caff9c Google discontinues Google checkout tomorrow. 
https://support.google.com/checkout/sell/answer/3080449?hl=en-GB
 2013-11-19 16:43:28 -05:00
Bradley M. Kuhn
fcffd1e873 Make it clear it's developers we need; separate hr more. 2013-11-15 14:25:09 -05:00
Bradley M. Kuhn
363df56194 Separate update more. 2013-11-15 14:24:22 -05:00
Bradley M. Kuhn
82b6ddf749 Add note about the project starting. 2013-11-15 14:21:42 -05:00
Bradley M. Kuhn
296f237b0a Add link to the Wiki. 2013-11-13 12:47:20 -05:00
Bradley M. Kuhn
ff1c40409d Fix typo in the height. 2013-10-10 10:35:47 -04:00
Bradley M. Kuhn
0a3928b135 Citrix became a sponsor a few weeks of Conservancy. 
I just received their logo this morning.
 2013-10-10 10:34:59 -04:00
Bradley M. Kuhn
2726656320 Updated with recently imported data from donations. 2013-10-09 12:11:24 -04:00
Bradley M. Kuhn
7c9bf099f2 phpMyAdmin has joined Conservancy: 
http://sfconservancy.org/news/2013/oct/07/phpMyAdmin-joins/
 2013-10-07 07:15:44 -04:00
Bradley M. Kuhn
d03fb818e2 Fix missing word. 2013-10-01 19:09:52 -04:00
Bradley M. Kuhn
a8ebfcec29 s/ecognition/recognition/ (spelling fix) 2013-10-01 18:49:36 -04:00
Bradley M. Kuhn
f07cb344c9 Updated FSA template to match current in use by Conservancy. 2013-09-30 17:47:48 -04:00
Bradley M. Kuhn
d9ea3af180 Mifos has spun out to the Mifos Initiative. 2013-09-24 09:54:20 -04:00
Bradley M. Kuhn
680f1f086b APRIL. 2013-09-24 09:54:06 -04:00
Bradley M. Kuhn
ffb4c20e3d Properly add April using the spelling they prefer. 2013-09-13 16:28:34 -04:00
Bradley M. Kuhn
2bd3fcbe3e Add APRIL to endorsement list. 2013-08-26 13:34:03 -04:00
Bradley M. Kuhn
89ce562e10 Note that the progress bar is now updated only weekly. 2013-07-30 17:51:23 -04:00
Bradley M. Kuhn
d7179594fb Updated to reflect recent donations. 2013-07-19 17:17:39 -04:00
Bradley M. Kuhn
01f2cca827 Updated from recent donation. 2013-07-08 18:04:55 -04:00
Bradley M. Kuhn
45c8785ad1 Include donations from the last few days. 2013-06-25 11:56:08 -04:00
Bradley M. Kuhn
e3d4ae0ffa Add donations for the last few days. 2013-06-20 13:41:21 -04:00
Bradley M. Kuhn
eb8665f3ec Donations from the last few days. 2013-06-18 13:11:23 -04:00
Bradley M. Kuhn
754ce012a5 Samsung is now a sponsor. 2013-06-18 12:55:42 -04:00
Bradley M. Kuhn
22549391a9 Updated recent donations. 2013-06-13 14:18:28 -04:00
Bradley M. Kuhn
722278cdfa Donations from the last few days. 2013-06-06 11:39:33 -04:00
Martin Michlmayr
38d6f6521b Typo fix 2013-06-06 08:13:10 -04:00
Martin Michlmayr
f91611b3db Add HP as a sponsor 2013-06-04 18:06:55 +01:00
Bradley M. Kuhn
7c04be601e Donations from over the weekend. 2013-06-03 12:01:31 -04:00
Jim Garrison
416a2787dd Removes last reference to Google Checkout being free for nonprofits. 
This finished what was partially fixed in be9ec7c6.

Patch submitted by Jim Garrison <jim@garrison.cc>.

Signed-Off-By: Bradley M. Kuhn <bkuhn@sfconservancy.org>
 2013-06-03 11:02:49 -04:00
Bradley M. Kuhn
348069b73d Recent donations. 2013-05-30 13:24:50 -04:00
Bradley M. Kuhn
890db3efbe Donation from yesterday. 2013-05-24 16:53:31 -04:00
Bradley M. Kuhn
b720d966ea Update from donations yesterday. 2013-05-23 12:11:29 -04:00
Bradley M. Kuhn
2682a4a484 Additional donation received today. 2013-05-22 10:48:13 -04:00
Bradley M. Kuhn
aa0bd86a5e Fix bad HTML tag. 2013-05-20 10:16:48 -04:00
Bradley M. Kuhn
0cf1e235ab Add two large donations announced today. 2013-05-20 10:04:22 -04:00
Bradley M. Kuhn
180876ecf5 Red Hat is now a sponsor. 2013-05-20 10:03:07 -04:00
Bradley M. Kuhn
2fcf94fc7d Add donation. 2013-05-18 08:32:49 -04:00
Bradley M. Kuhn
7548226145 Correct width and height. 2013-05-17 16:10:21 -04:00
Bradley M. Kuhn
336a94d644 It's a png, not a jpg. Also, no () on alt name. 2013-05-17 16:09:42 -04:00
Bradley M. Kuhn
ce0e1ead15 Add appendTo as a sponsor. 2013-05-17 16:08:34 -04:00
Bradley M. Kuhn
df56292717 Additional donation this week. 2013-05-16 16:44:11 -04:00
Bradley M. Kuhn
3cb2120df3 Updated based on today's donations. 2013-05-13 15:30:40 -04:00
Bradley M. Kuhn
6d317c06f0 Increase progress bar for donations from the last 24 hours. 2013-05-07 12:22:34 -04:00
Bradley M. Kuhn
51c90ba720 Updated campaign totals. 2013-05-06 10:21:51 -04:00
Bradley M. Kuhn
c10744ecd5 updated Loïc's bio, per his email to me with the new one. 2013-05-03 15:19:10 -04:00
Bradley M. Kuhn
c21a851310 .00 is too much detail. It was from a bad paste. 2013-05-03 10:05:26 -04:00
Bradley M. Kuhn
fbe4887276 Imported a few more donations. 2013-05-03 09:53:30 -04:00
Bradley M. Kuhn
6c61d85270 Imported today's transactions. Adds $545 not yet imported. 2013-05-02 20:50:08 -04:00
Bradley M. Kuhn
ee7aa6257a Updated percentage based on today's PayPal donations. 2013-05-02 18:55:34 -04:00
Bradley M. Kuhn
ba3e5070d7 Full PayPal donations and invoice-related pledges. 2013-05-02 07:57:57 -04:00
Bradley M. Kuhn
384eb14ada Another donation. 2013-05-01 14:19:28 -04:00
Bradley M. Kuhn
46a734557d Updated based on a few more donations. 2013-05-01 14:12:42 -04:00
Bradley M. Kuhn
e8f46af4a4 Another donation. Silly to not have this more automatically updated, 
but it's fun to watch initial donations roll in.  I'll go back to the
promised "once per day" tomorrow, I suspect.
 2013-05-01 11:12:38 -04:00
Bradley M. Kuhn
b827c73fc8 Still watching donations come in by hand. Another arrived. 2013-05-01 11:00:20 -04:00
Bradley M. Kuhn
d01b75f95e I probably won't track each donation this quickly, but the campaign just started. 2013-05-01 10:42:00 -04:00
Bradley M. Kuhn
1f39c17684 Change OSI link to go to new page that Simon just emailed me about. 2013-05-01 10:25:11 -04:00
Bradley M. Kuhn
b82b463399 Add a 2% buffer between the donation box and the text. 2013-05-01 08:52:40 -04:00
Bradley M. Kuhn
d2afb791f2 I didn't really want a view-source in this staff link. 2013-05-01 08:50:18 -04:00
Bradley M. Kuhn
2565c0335d Take away period, since no other quote has that. 2013-05-01 08:49:20 -04:00
Bradley M. Kuhn
232a49df64 Move endorsement <a> tag to the start of the endorsement sentence. 2013-05-01 08:47:46 -04:00
Bradley M. Kuhn
631d2c2360 I can't otherwise get this text-decoration: none thing to work, 
so I just made sure there's no text in it.
 2013-05-01 08:47:08 -04:00
Bradley M. Kuhn
285cfa7ebd Normalize "The" Free Software Foundation. 2013-05-01 08:44:56 -04:00
Bradley M. Kuhn
ff2ba6232c Use pure relative link here. 2013-05-01 08:44:24 -04:00
Bradley M. Kuhn
94526d416d Implement slider to draw attention to donate box upon clicking of donate links. 
Replaces previous self-link back to same page that was rather pointless.

I've tested that this Gracefully degrades on a non-graphical browser to just
in-page link back to the donate portion at the top the page.
 2013-05-01 08:44:12 -04:00
Bradley M. Kuhn
123e09fe3d Alt text of PayPal button should just say "Donate" 2013-05-01 00:12:54 -04:00
Bradley M. Kuhn
c482e9a1fd Better formatting for the progress bar. 2013-05-01 00:01:57 -04:00
Bradley M. Kuhn
b1b025f018 Fix styles on the <div>'s so that overlap isn't strange. 
Whole thing should really add up to 100%, after all.
 2013-04-30 23:58:03 -04:00
Bradley M. Kuhn
fa1dc618df Remove ?'s and just list them out as other donation methods. 2013-04-30 23:57:41 -04:00
Bradley M. Kuhn
a08c3dd90c Fix "Donating" text. 2013-04-30 23:40:46 -04:00
Bradley M. Kuhn
1f03762dab Don't wrap <a> around the <h3> 2013-04-30 23:39:02 -04:00
Bradley M. Kuhn
8c80bfe052 Walk-through and plenty of word-smith changes. 2013-04-30 23:38:54 -04:00
Bradley M. Kuhn
23d2d8cad1 Make the toggle-controls look like clickable <a> tags. 2013-04-30 22:29:12 -04:00
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
Bradley M. Kuhn
e4b2e1ffde Linked up Karen's bios. 2011-09-30 10:54:27 -04:00
Bradley M. Kuhn
f9debc971d Fixed typo. 2011-09-30 10:51:13 -04:00
Bradley M. Kuhn
9b932816e0 Added Dan to Outside Counsel page. 2011-09-30 10:49:29 -04:00
Bradley M. Kuhn
ba21a745bc Fixed Karen's bio and added her to outside counsel page. 2011-09-30 10:42:55 -04:00
Bradley M. Kuhn
10fdfa32e7 Another attempt to fix <a> tags. 2011-09-30 09:35:55 -04:00
Bradley M. Kuhn
c4aadb3cc4 Additional fix needed to handle website highlighting. 2011-09-30 09:35:18 -04:00
Bradley M. Kuhn
e6b507f7db Fixed <a id=> tags to not link around name 2011-09-30 09:27:14 -04:00
Bradley M. Kuhn
9eb6dece5c Fixed CSS to highlight on about page properly. 2011-09-30 09:26:17 -04:00
Bradley M. Kuhn
7fc2a43c0a Added basic legal services to list of membership benefits. 2011-09-30 09:24:29 -04:00
Bradley M. Kuhn
f953273280 Added id for bkuhn and tony. 2011-09-30 09:23:50 -04:00
Bradley M. Kuhn
a2816aa502 Added Tony Sebro to staff, add outside counsel and contractors. 2011-09-30 09:22:14 -04:00
Bradley M. Kuhn
e2d93ab133 Added FY 2007 Form 990 and CHAR 500. 
Changed a bit of the wording on filings page.
 2011-09-03 13:47:01 -04:00
Bradley M. Kuhn
8dab33a0da Information about when to expect Form 990. 2011-09-03 13:29:36 -04:00
Bradley M. Kuhn
164dc675c3 Added Stormy and Peter to directors and Peter as Treasurer 2011-08-15 12:06:39 -04:00
Bradley M. Kuhn
f8d009e48a Fixed unclosed tag 2011-07-20 12:57:42 -04:00
Bradley M. Kuhn
1fd0545b9e Added wire transfer information. 2011-07-15 09:52:16 -04:00
Bradley M. Kuhn
b779208888 Corrected PayPal donation button. 2011-07-06 09:44:59 -04:00
Bradley M. Kuhn
0789f66ffa Axel Metzger has resigned as a director, effective today. 2011-06-20 10:38:35 -04:00
Bradley M. Kuhn
9a3e2f12da Added Evergreen to list of member projects. 2011-06-16 09:18:24 -04:00
Bradley M. Kuhn
3c3de3e61b Link to news page; not perfect but better than other options. 2011-06-13 17:24:42 -04:00
Bradley M. Kuhn
924b9e9b01 Directorship change. 2011-05-02 10:53:44 -07:00
Bradley M. Kuhn
2c29342257 Matt Wilson is no longer a director. 2011-04-25 12:32:47 -04:00
Bradley M. Kuhn
dec19b218f Fixed typo. 2011-03-24 02:59:21 -04:00
Bradley M. Kuhn
4040ac1973 Fixed Google Checkout link. 2011-02-20 20:23:27 -05:00
Bradley M. Kuhn
0df7cde890 Added Twitter and Identica follow links. 2011-02-15 10:35:21 -05:00
Bradley M. Kuhn
0b214f8bfe Fixed bad alphabetical order. 2011-02-02 08:34:26 -05:00
Bradley M. Kuhn
a2a6773ba7 Added paragraph on Selenium, which will join shortly. 2011-01-25 10:51:32 -05:00
Bradley M. Kuhn
5bf3e10184 Added count to top of membership page. 2011-01-17 14:49:23 -05:00
Bradley M. Kuhn
ac5b67661a Removed stray >'s. 2011-01-17 14:48:38 -05:00
Bradley M. Kuhn
aa792036f2 Added Gevent description; it's joining Conservancy as of 2011-01-18 09:00 US/Eastern. 2011-01-17 14:44:18 -05:00
Bradley M. Kuhn
b1419ca6bb Fixed typo in URL on front page. 2011-01-13 15:40:18 -05:00
Bradley M. Kuhn
7bf3c6a8bd Various grammar and wording improvements, and added note about opposing swpats. 2011-01-03 07:31:35 -05:00
Bradley M. Kuhn
69b64e2b05 Corrected grammar error as reported by tedks: http://identi.ca/notice/61449503 2011-01-03 06:54:36 -05:00
Bradley M. Kuhn
1c16ebb4d8 Typo fix. 2011-01-02 15:28:44 -05:00
Bradley M. Kuhn
72111eb47c Added information about FY 2010 filings. 2011-01-02 15:25:01 -05:00
Bradley M. Kuhn
452e9b4c74 Dan Ravicher resigned of the board effective 2010-12-31 2011-01-02 15:09:19 -05:00
Bradley M. Kuhn
74f6592442 Added links to FY 2009 filings. 2011-01-02 15:08:04 -05:00
Bradley M. Kuhn
21234fa09d Added FY 2009 Federal Form 990 and NYS Form CHAR-500. 2011-01-01 11:32:09 -05:00
Bradley M. Kuhn
ed40adab39 Removed extraneous line. 2011-01-01 11:31:46 -05:00
Bradley M. Kuhn
e2c60c5c6e Added minor clarification to spending funds. 2011-01-01 11:31:34 -05:00
Bradley M. Kuhn
0717d2dd93 Some typo fixes. 2010-12-16 14:02:19 -05:00
Bradley M. Kuhn
c8db190b3d Git joined Conservancy! 2010-12-16 11:06:59 -05:00
Bradley M. Kuhn
96f20a2855 Make bullet list of benefits. 2010-12-16 11:06:47 -05:00
Bradley M. Kuhn
1938a196a1 Added FAQ about what a fiscal sponsor is. 2010-11-19 09:24:26 -05:00
Bradley M. Kuhn
f4f8527f28 Moved benefits question higher. 2010-11-19 09:20:37 -05:00
Bradley M. Kuhn
b7d9a02553 Mention documentation as well as development! 2010-11-10 10:11:05 -05:00
Bradley M. Kuhn
abb8ed1034 Colon should go here. 2010-11-10 09:51:19 -05:00
Bradley M. Kuhn
42b701caf5 Fixed closing tag typo. 2010-11-10 09:49:49 -05:00
Bradley M. Kuhn
458a279d00 Grammar fixes and related typos discovered by Loïc Dachary. Thanks! 2010-11-10 09:46:44 -05:00
Bradley M. Kuhn
d9de05e75c Fixed PyPy paragraph based on discussions with Holger. 2010-11-10 09:42:38 -05:00
Bradley M. Kuhn
d2c666ed41 Minor changes to URLs. 2010-10-11 16:29:20 -04:00
Bradley M. Kuhn
c88641d47c Put up to three news items on Conservancy front page. 2010-10-11 16:13:50 -04:00
Bradley M. Kuhn
ff42a3b85d News category setting comes from template we inherit from. 2010-10-11 16:09:46 -04:00
Bradley M. Kuhn
40cd98bf44 First attempt at implementing fabsh color scheme that he emailed me: 
Date: Sun, 10 Oct 2010 18:12:36 +0200
Subject: Conservancy Colour Palette
From: "Fabian A. Scherschel" <fab@sixgun.org>
To: "Bradley M. Kuhn" <bkuhn@sfconservancy.org>
Message-ID: <AANLkTinX7mxV8-2gn2CQB82QnPLZWw3rYr4OUHpX1WDX@mail.gmail.com>
 2010-10-11 16:08:59 -04:00
Bradley M. Kuhn
654453c1c2 Allow for two news items at once on the frontpage. 2010-10-11 15:53:18 -04:00
Bradley M. Kuhn
6992f63bb4 Test thing for redirect table. 2010-10-11 15:48:17 -04:00
Bradley M. Kuhn
fb658152cf Fixed email address in the template. 2010-10-05 10:55:43 -04:00
Bradley M. Kuhn
f24a2fc033 Added omnibus feed templates. Without these, the feed seemed to work, but 
the description text was not appearing.
 2010-10-05 10:52:05 -04:00
Bradley M. Kuhn
9b59b9efe3 Don't require trailing / on RSS feed URLs. 2010-10-05 10:45:50 -04:00
Bradley M. Kuhn
888028f64b Jeremy emailed me his bio to use for the Conservancy website: 
To: "Bradley M. Kuhn" <bkuhn@sfconservancy.org>
Cc: jra@samba.org
Message-ID: <20101005004226.GA27337@samba1>
Date: Mon, 4 Oct 2010 17:42:26 -0700
From: Jeremy Allison <jra@samba.org>
Subject: Re: bio for Conservancy website
 2010-10-05 10:09:09 -04:00
Bradley M. Kuhn
d1517bb143 Mark is now Treasurer, since last month. Forgot to add that then. 2010-10-04 16:30:11 -04:00
Bradley M. Kuhn
f959a25db8 Fixed typo in bio. 2010-10-04 16:28:31 -04:00
Bradley M. Kuhn
b9742751cb Fixed bkuhn bios and added bkuhn to staff. 2010-10-04 16:26:57 -04:00
Bradley M. Kuhn
41f6b66215 Fixed broken URL (thanks David Abrahams <dave@boostpro.com> for bug report) 2010-10-04 12:36:15 -04:00
Bradley M. Kuhn
c2b771086c Proper placement of tag close. 2010-10-04 12:29:26 -04:00
Bradley M. Kuhn
b0fd4e13db s/.../&hellip;/ 2010-10-04 12:25:53 -04:00
Bradley M. Kuhn
4fac84c550 Change email address. 2010-10-04 12:24:45 -04:00
Bradley M. Kuhn
64feb78cf7 removed extraneous space. 2010-10-04 12:17:16 -04:00
Bradley M. Kuhn
28e3f83841 Got Blog working; Fixed feeds added content to front page; switch blog template style. 2010-10-04 12:15:53 -04:00
Bradley M. Kuhn
9ec1bbe85a Corrected front page code and template so that blog posts appear. 2010-10-04 11:27:04 -04:00
Bradley M. Kuhn
c144b0c54e Added blog to URL list and to front page. Fixed columns on front page. 2010-10-04 10:54:09 -04:00
Bradley M. Kuhn
ed954b76ee Adapted column CSS solution used for sidebar to also work on general 
column CSS
 2010-10-04 10:53:52 -04:00
Bradley M. Kuhn
79140d46a5 Added blog templates. 2010-10-04 09:52:04 -04:00
Bradley M. Kuhn
a6f8800a3f Improved year look. 2010-10-04 09:47:51 -04:00
Bradley M. Kuhn
72b907c639 These items in the menu no longer exist. 2010-10-04 09:36:20 -04:00
Bradley M. Kuhn
503b0bd8cf Fix of placement of submenu category block. 2010-10-04 09:36:07 -04:00
Bradley M. Kuhn
9faa28f04f Wordsmith and rewrite of the first service listed. 2010-10-04 09:35:52 -04:00
Bradley M. Kuhn
77d4079021 Fixed missing endblock in staff. 2010-10-03 23:09:43 -04:00
Bradley M. Kuhn
54451c15e2 I think I want this color to appear on highlighted menu items. 2010-10-03 23:08:56 -04:00
Bradley M. Kuhn
efc7cf0c80 don't say 'tel' anymore. 2010-10-03 23:04:23 -04:00
Bradley M. Kuhn
d5d06241f2 Added missing comma. 2010-10-03 23:03:17 -04:00
Bradley M. Kuhn
cf557169e9 Use green on bold. 2010-10-03 23:02:26 -04:00
Bradley M. Kuhn
b296fc9557 Don't select a font. 2010-10-03 22:57:17 -04:00
Bradley M. Kuhn
9065e188a0 Fixed link to staff page. 2010-10-03 22:54:14 -04:00
Bradley M. Kuhn
0db34389e5 Added staff page. 2010-10-03 22:53:42 -04:00
Bradley M. Kuhn
d88869ff92 Minor typo and formatting fixes. 2010-10-03 22:52:02 -04:00
Bradley M. Kuhn
3ea00297ec Created source links. 2010-10-03 22:28:24 -04:00
Bradley M. Kuhn
4e9feb1a2a Minor edits to the privacy policy. 2010-10-03 21:53:39 -04:00
Bradley M. Kuhn
88ef25012f Moved some overview text over to frontpage; fixed typo in overview; 
s/.../&hellip;/
 2010-10-03 21:50:16 -04:00
Bradley M. Kuhn
10bfb44647 &mdash; is not &ldquo; 2010-10-03 21:45:00 -04:00
Bradley M. Kuhn
5b48141070 Various formatting and typo fixes. 2010-10-03 21:44:32 -04:00
Bradley M. Kuhn
52b6c80c24 Various wordsmith, rewrite and new content for membership area of the 
site.
 2010-10-03 21:32:00 -04:00
Bradley M. Kuhn
7b7640f736 Added Fundraising assistance, and "fiscal sponsorship" mention 2010-10-03 20:35:08 -04:00
Bradley M. Kuhn
71f773159e s/conservancy.softwarefreedom.org/sfconservancy.org/g 2010-10-03 20:28:09 -04:00
Bradley M. Kuhn
cffebff968 Added submenu to CSS. 2010-10-03 20:25:39 -04:00
Bradley M. Kuhn
8179150188 Beginning work on members submenu group on the site: 
* wrote services page.
  * created template.
  * added submenu to CSS.
 2010-10-03 20:25:30 -04:00
Bradley M. Kuhn
2e40f1981d Moved paragraph that was previously in overview to directors page. 2010-10-03 20:23:04 -04:00
Bradley M. Kuhn
993c1348fb Moved project member list into current subdirectory. 2010-10-03 20:22:44 -04:00
Bradley M. Kuhn
c20c6dfc07 Rewrote overview. 2010-10-03 19:30:08 -04:00
Bradley M. Kuhn
d2af6a0cb5 Rework of about section, including many content changes and a few 
formatting ones.
 2010-10-03 19:07:48 -04:00
Bradley M. Kuhn
f426e60136 Mostly got a sidebar on the left working, for submenu. 
Modifications to the templates to take advantage of new submenu.
Some content changes with "about" section, where I was implementing the changes.
 2010-10-03 18:37:08 -04:00
Bradley M. Kuhn
fea99e7c01 Reorgainzed officer and board directories. 2010-10-03 18:07:34 -04:00
Bradley M. Kuhn
450ea2c354 Attempts to get left side bar right. 2010-10-03 17:35:57 -04:00
Bradley M. Kuhn
8a0ecb9731 Corrected favicon.ico to be Conservancy logo. 2010-10-03 13:46:02 -04:00
Bradley M. Kuhn
d53922ed5c Removed blank line. 2010-10-03 13:45:48 -04:00
Bradley M. Kuhn
cfd70dca90 CSS fixes. 2010-10-03 13:33:41 -04:00
Bradley M. Kuhn
e256b5329c Next version of Fab's text-containing image logo; some CSS and HTML 
changes to make the appearance of it better.
 2010-10-03 13:29:23 -04:00
Bradley M. Kuhn
91ef826abd New header logo with text embedded into the image (thanks to Fab) 2010-10-03 13:18:13 -04:00
Bradley M. Kuhn
affb41bcde Try with 120px size image. 2010-10-03 12:34:33 -04:00
Bradley M. Kuhn
9d648ff332 trying another color. Is it better to make font-size smaller? 2010-10-03 12:30:27 -04:00
Bradley M. Kuhn
cb782bbd87 Another color test; and fix of text size. 2010-10-03 12:28:08 -04:00
Bradley M. Kuhn
37e355a155 Trying a new color; attempt to fix text size. 2010-10-03 12:24:36 -04:00
Bradley M. Kuhn
34a5a7a2e0 Attempts to fix text display; make background white as an experiment. 2010-10-03 12:20:01 -04:00
Bradley M. Kuhn
0fc09ea154 Color improvement from fab; still trying to work out text placement. 2010-10-03 12:13:12 -04:00
Bradley M. Kuhn
8c4a6d2a91 Color fab suggests; attempt to fix text. 2010-10-03 12:07:57 -04:00
Bradley M. Kuhn
53acfaa42f First attempt and putting logo up on the site. 2010-10-03 12:04:17 -04:00
Bradley M. Kuhn
3324cfe1fe Added logobutton class. 2010-10-03 11:24:28 -04:00
Bradley M. Kuhn
6b0577b505 Added admin-media 2010-09-30 10:30:33 -04:00
Bradley M. Kuhn
85eae7afbb removed reference to SFLC object 2010-09-30 10:24:03 -04:00
Bradley M. Kuhn
34d5e020d7 Fixed canonical hostname 2010-09-30 10:23:53 -04:00
Bradley M. Kuhn
9f50eeb52c modpythoncustom was needed for Django operation 2010-09-29 20:35:21 -04:00
Bradley M. Kuhn
38cabe7ba3 Needed images 2010-09-29 20:35:04 -04:00
Bradley M. Kuhn
7cdb205f4b Fixed domain name. 2010-09-26 20:27:31 -04:00
Bradley M. Kuhn
a0968398ca Renamed file. 2010-09-26 20:26:44 -04:00
Bradley M. Kuhn
613a018076 Migrated some settings to djangocommonsettings so they can easily be overridden. 2010-09-26 20:26:32 -04:00
Bradley M. Kuhn
21070bba48 SSL site from previous running instance on conservancy.softwarefreedom.org 2010-09-26 19:37:01 -04:00
Bradley M. Kuhn
698e9324a6 Fixed to be Jim Garrison's copyright per Eben Moglen's directive that all 
SFLC employees hold their own copyright on the software they write.
 2010-09-26 19:36:39 -04:00
Bradley M. Kuhn
1f2a8e5d5c Renamed wrapper. 2010-09-26 19:31:22 -04:00
Bradley M. Kuhn
fb307d8cf2 URL and variable name fixes; added license text. 2010-09-26 19:24:38 -04:00
Bradley M. Kuhn
bd6199f7b0 Added middleware and management file 2010-09-26 19:03:53 -04:00
Bradley M. Kuhn
839b64e714 Brought over wrapper previously used on conservancy.softwarefreedom.org 2010-09-26 18:51:02 -04:00
Bradley M. Kuhn
12780197e5 Adapted Django application stuff for Conservancy; and normalized to string 
"conservancy" within code and templates.
 2010-09-26 17:56:29 -04:00
Bradley M. Kuhn
f7e45da6dd Adapted Django application stuff for Conservancy; and normalized to string 
"conservancy" within code and templates.
 2010-09-26 17:54:29 -04:00
Bradley M. Kuhn
8e6ea8ad71 Applications directory from SFLC website; About to adapt it for Conservancy website to run on its own 2010-09-26 17:32:53 -04:00
Bradley M. Kuhn
c858e825c0 Conservancy website as it currently looks; unfortunately, old history before this cannot easily be retrieved 2010-09-26 17:20:05 -04:00