Commit graph

775 commits

Author SHA1 Message Date
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