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