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

894 commits

Author SHA1 Message Date
Bradley M. Kuhn
18ad81db68 VMware Lawsuit FAQ: technical description example 
Written by Denver Gingerich <denver@sfconservacy.org> and me, this
description gives one example of how VMware incorporated Linux code with
vmkernel and distributed the resulting work.
 2015-03-12 07:59:22 -07:00
Bradley M. Kuhn
9d0627610f Make rise level consistent for both items. 
With this change, both numbers should go up at the same rate.
 2015-03-11 18:57:06 -07:00
Bradley M. Kuhn
7ea7e8ef60 Correct initialization and counter. 2015-03-11 18:42:40 -07:00
Bradley M. Kuhn
1eddf3fd09 Fix typo: wrong language. :) 2015-03-11 18:41:24 -07:00
Bradley M. Kuhn
76f5e1b7ea Increase donation count by 1% each time. 
Increasing by one makes it last too long.  Doing 1% will make it go just
as fast as the fundraiser.
 2015-03-11 18:38:38 -07:00
Bradley M. Kuhn
a7a15cec8b Better handle no value situations. 
The issue where these values were empty was not properly handled.
 2015-03-11 18:36:01 -07:00
Bradley M. Kuhn
8b469cff18 Support display of donation count in fundraiser. 
Allow display of a donation count in the fundraiser pages, with an
optional threshold that must be met before it's displayed.
 2015-03-11 18:10:28 -07:00
Bradley M. Kuhn
20f2339a1f VMware Lawsuit FAQ entry: Why doesn't FSF enforce? 
This FAQ and its answer explain why the FSF can't take care of
enforcement for this particular matter.
 2015-03-11 13:15:01 -07:00
Bradley M. Kuhn
5f6ccfa1f4 When hovering over li,anchor changes background... 
.. even though you havent’t yet hovered over the link.

This change corrects that behavior.  Suggested by mina86:

<mina86> so when you hover over the LI the link changes background even though
         you havent’t yet hovered over the link
<mina86> #container #sidebar li:hover a { background: #577632; color: #fff; }
<mina86> s/li:hover a/li a:hover/ would be IMO better
 2015-03-10 18:54:03 -07:00
Bradley M. Kuhn
49c51d0201 Rik van Riel statement of support. 2015-03-10 18:51:40 -07:00
Bradley M. Kuhn
a0340fc820 Add Dave Airlie's statement of support too. 2015-03-10 15:34:31 -07:00
Bradley M. Kuhn
a914a68526 Additional statements of support. 2015-03-10 14:15:32 -07:00
Bradley M. Kuhn
1d1e0a1ed9 Add Wolfram Sang's statement of support. 2015-03-09 16:31:34 -07:00
Bradley M. Kuhn
bcf89f1953 Make use of new animations on supporter page. 2015-03-09 08:50:47 -07:00
Bradley M. Kuhn
efe90bd2d0 Better animation effects when donate link clicked. 
The banner always faded in/out, but now other texts can be designated
with the class 'donate-box-highlight' and those will fade out and fade
back in with bold and slightly larger font.
 2015-03-09 08:46:16 -07:00
Bradley M. Kuhn
b571c7fdeb Grammar fix. 2015-03-09 08:44:35 -07:00
Bradley M. Kuhn
6e3b2a22be Animate the progress bar at page load. 
This is perhaps too flashy, but it does successfully animate the
progress bar up to the target amount, and also changes the amount until
it reaches the total raised so far.
 2015-03-09 00:28:05 -07:00
Bradley M. Kuhn
2678369b5a text-align should inherit when in progressbar. 2015-03-08 23:51:32 -07:00
Bradley M. Kuhn
3be224c69a Diff CSS for fundraiser-percentage w/ progressbar. 
If Javascript is present to generate the pogressbar, then the CSS really
should be radically different.

Graceful degradation.
 2015-03-08 23:48:57 -07:00
Bradley M. Kuhn
a1fa72ac8d vertical-align was not actually doing anything. 2015-03-08 23:43:02 -07:00
Bradley M. Kuhn
ab2239009a Rework again to see if I can get this corrected. 2015-03-08 23:40:47 -07:00
Bradley M. Kuhn
f64ff43450 Rework to simply call with new kwargs. 
Redo call so that I just get my own at call time.
 2015-03-08 23:36:38 -07:00
Bradley M. Kuhn
f8f37dd39c Must move import as well. 2015-03-08 23:31:44 -07:00
Bradley M. Kuhn
b3f019265b Rework fundgoal lookup urls data. 
The urls.py is of course only evaluated once: at Apache load time, which
means the data in the template became stale and is not dynamic.

This change should cause the lookup to happen at each page view.
 2015-03-08 23:28:42 -07:00
Bradley M. Kuhn
60d016134f Use caching to, ironically, prevent caching. 
Now that I'm updating the database out of band with information about
the fundraiser, I've found that the page does not properly update.

This change will hopefully fix the issue.
 2015-03-08 23:19:07 -07:00
Bradley M. Kuhn
db4a82f432 Correct goal amount for admin display. 2015-03-08 23:00:32 -07:00
Bradley M. Kuhn
902999b657 Update to match when we are right now. 2015-03-08 22:34:38 -07:00
Bradley M. Kuhn
a8bd5a2129 Leave text w/ percentage when no progressbar 
The progressbar is generated by Javascript.  As such, the text here
won't have a progressbar formatted around it when the browser doesn't
support Javascript.

However, since the Javascript does update the text, we can format the
Django template to put in place text that we wish will appear when no
Javascript is turned on, and then allow the Javascript to make it right
when it's available.

Graceful degradation: I may be its last proponent.
 2015-03-08 22:08:14 -07:00
Bradley M. Kuhn
b88b6bd211 Forgot to load humanize, needed for formatting. 2015-03-08 22:04:24 -07:00
Bradley M. Kuhn
51ebbc9cb8 Convert VMware fundraiser to new dynamic content. 
Use the new dynamic content fundgoal stuff for VMware fundraiser.
 2015-03-08 21:54:34 -07:00
Bradley M. Kuhn
732bf3b4c8 Not so high. 2015-03-08 21:51:37 -07:00
Bradley M. Kuhn
e631dd41ef Top and bottom margin might help. 2015-03-08 21:51:06 -07:00
Bradley M. Kuhn
d17dcf145e Go back to float right. 2015-03-08 21:50:19 -07:00
Bradley M. Kuhn
cd6ba9e352 Go back to this version, it seems better. 2015-03-08 21:49:26 -07:00
Bradley M. Kuhn
e664a104a7 See if this places the percentage better. 2015-03-08 21:48:29 -07:00
Bradley M. Kuhn
df9976598c Better formatting on fundraising-percentage. 2015-03-08 21:46:48 -07:00
Bradley M. Kuhn
ad787ca5a9 fundraising percentage goes with progressbar. 2015-03-08 21:43:49 -07:00
Bradley M. Kuhn
54118f965d fundraiser-percentage should be in bold. 2015-03-08 21:42:53 -07:00
Bradley M. Kuhn
51ab3f365c Possibly need a span# here. 2015-03-08 21:41:53 -07:00
Bradley M. Kuhn
157c438899 CSS for the fundraising percentage text. 2015-03-08 21:38:38 -07:00
Bradley M. Kuhn
c438b40621 Add heading. 2015-03-08 21:35:16 -07:00
Bradley M. Kuhn
1327b684d6 Use supporter-page.js & its formatting conventions 
The npoacct campaign was launched before the Supporter program, and
parts of its functionality were incorporated into supporter-page.js
ultimately.  This commit hopefully now backports that functionality to
npoacct campaign.
 2015-03-08 21:31:42 -07:00
Bradley M. Kuhn
8888a12699 Import decimal needed. 2015-03-08 21:28:44 -07:00
Bradley M. Kuhn
65142c984a Convert 100.00 to Decimal for operation. 2015-03-08 21:27:13 -07:00
Bradley M. Kuhn
637dd98a68 self. was needed here. 2015-03-08 21:24:09 -07:00
Bradley M. Kuhn
027964192a Function to compute how far to the goal we are. 
This is also inserted by the Javascript code as well, but no reason we
can't compute it server side, too.
 2015-03-08 21:21:58 -07:00
Bradley M. Kuhn
eb18c15f66 I didn't realize extend is first 2015-03-08 21:17:06 -07:00
Bradley M. Kuhn
4a5af8324a Use humanize to format dollar amounts 2015-03-08 21:12:36 -07:00
Bradley M. Kuhn
3442c1bd1d Variables don't go in {% in Django templates. 2015-03-08 21:03:36 -07:00
Bradley M. Kuhn
e0cb1621b1 Convert npoacct fundraiser to use dynamic content 
If this new model works, we should be able to update the fundraiser
amounts in the Django database instead of the HTML.
 2015-03-08 20:57:22 -07:00
Bradley M. Kuhn
3b0e6778e1 Correct get call to use arg properly. 
This was just a typo in from previous commit, more or less.
 2015-03-08 20:50:42 -07:00
Bradley M. Kuhn
09654a5eac Fundraising goal lookup for template: 1st attempt 
This seems to be the best approach to pass a fundraising goal record to
a template.  While the static hack that tmarble implemented probably
needs work anyway, this is probably the best way currently to interface
certain general data that we seek to place on many different pages
through the templates.

I looked into a templatetags solution, but this seemed more
straightforward and more fitting with Django principles (I think :).
 2015-03-08 20:46:37 -07:00
Bradley M. Kuhn
0d2908ef30 Add empty __init__.py for fundgoal. 2015-03-08 18:18:46 -07:00
Bradley M. Kuhn
71834b60ec Fix another typo in import correction. 2015-03-08 18:16:33 -07:00
Bradley M. Kuhn
a5cd6ab63b Make defaults for BooleanFields. 
According to django-admin check,

   (1_6.W002) BooleanField does not have a default value.
    HINT: Django 1.6 changed the default value of BooleanField from False to None. See https://docs.djangoproject.com/en/1.6/ref/models/fields/#booleanfield for more information.
 2015-03-08 18:00:50 -07:00
Bradley M. Kuhn
bef4637016 Fix typos in module path names from last commit. 2015-03-08 17:56:56 -07:00
Bradley M. Kuhn
f6bbcc7ee3 Just quit it with this relative import stuff. 
While I think these relative imports seem to be valid for the running
application, I am having trouble with the django-admin applications
regarding them.  I don't see this syntactic sugar as absolutely
essential, so I'm just going to change it now.
 2015-03-08 17:54:05 -07:00
Bradley M. Kuhn
d73018440a Initial hack at a fundraising goal application. 
This simple application will simply store the code name and the to goal
of each fundraiser.  The so_far number will likely just be updated by
some external script, modifying the appropriate entry in the SQL
database.
 2015-03-08 17:40:24 -07:00
Bradley M. Kuhn
663a7b9491 Additional donations. 2015-03-08 17:30:21 -07:00
Bradley M. Kuhn
b412f8c619 According to kfogel, any id= works, even in ul 2015-03-08 13:12:21 -07:00
Bradley M. Kuhn
a26af07ea5 Tie sentence in better. 2015-03-08 11:57:15 -07:00
Bradley M. Kuhn
7212a3fef8 Better grammar. 2015-03-08 11:50:39 -07:00
Bradley M. Kuhn
3f4eaee502 Note that people get a t-shirt if they donate $120. 2015-03-08 11:49:33 -07:00
Bradley M. Kuhn
cfaf09b9b1 Additional donations. 2015-03-08 11:46:22 -07:00
Bradley M. Kuhn
7d22c563c4 More detail about copyleft.org 2015-03-08 11:20:31 -07:00
Bradley M. Kuhn
d986913e3c Updated with additional donations. 2015-03-08 09:32:59 -07:00
Bradley M. Kuhn
fee584578d Wording fix and expand on fact. 2015-03-07 23:12:06 -08:00
Bradley M. Kuhn
2e4a50c199 Merge branch 'master' from upstream. 2015-03-07 23:08:15 -08:00
Bradley M. Kuhn
076645b137 Update donations total. 2015-03-07 23:07:47 -08:00
Martin Michlmayr
f58a9233c6 Fix link to copyleft.org 2015-03-07 22:35:31 -05:00
Bradley M. Kuhn
098f7cc276 Correct compliance menu selector. 2015-03-07 14:09:56 -08:00
Bradley M. Kuhn
705a4e2161 Add link to copyleft.org on sidebar for compliance 2015-03-07 14:07:24 -08:00
Bradley M. Kuhn
aa879d526a Update total. 2015-03-07 14:06:17 -08:00
Bradley M. Kuhn
30cbfd72f1 Add note about copyleft.org on GPL Compliance page 2015-03-07 14:05:52 -08:00
Bradley M. Kuhn
c9442b9ae0 Slight increase. 2015-03-07 12:11:43 -08:00
Bradley M. Kuhn
bfda95d191 Wordsmith this FAQ answer. 2015-03-06 17:43:18 -08:00
Bradley M. Kuhn
718bad4a65 Additional donations imported. 2015-03-06 17:20:29 -08:00
Bradley M. Kuhn
54119bba74 Add list of those who support the action to FAQ. 
Also, note that when people donate, they may also want to make public
statements of support.
 2015-03-06 16:37:30 -08:00
Bradley M. Kuhn
f164028c2e Update with donation import data. 2015-03-06 16:30:08 -08:00
Bradley M. Kuhn
809d80b335 update with more donation. 2015-03-06 14:45:33 -08:00
Bradley M. Kuhn
9233d1dceb More donations. 2015-03-06 11:05:53 -08:00
Bradley M. Kuhn
4893423082 Updated based on donations. 2015-03-06 09:51:18 -08:00
Bradley M. Kuhn
fd4b0d9445 Merge branch 'master' with upstream changes. 2015-03-05 22:32:08 -08:00
Bradley M. Kuhn
9484482e19 Additional donations. 2015-03-05 22:30:22 -08:00
Martin Michlmayr
bf71135f75 Update number of member projects 2015-03-05 18:51:26 -05:00
Bradley M. Kuhn
9f8a5100bc Scale only by 75%, not 50%. 2015-03-05 15:31:38 -08:00
Bradley M. Kuhn
b271e87e26 Updated total. 2015-03-05 15:21:14 -08:00
Bradley M. Kuhn
7694d3b1f8 Image inside FAQ should scale to size. 
Some have complained that the image inside the FAQ does not scale to
size.  This corrects that problem.
 2015-03-05 15:20:26 -08:00
Bradley M. Kuhn
712ca8afbe new donations. 2015-03-05 14:27:14 -08:00
Bradley M. Kuhn
77c4e50b7b More donations. 2015-03-05 13:57:48 -08:00
Bradley M. Kuhn
097c82ea26 Move progressbar CSS to CSS file, not hard code. 
Also, increase size of progress bar (HT tmarble)
 2015-03-05 13:32:49 -08:00
Bradley M. Kuhn
32e9164d48 Don't hard code style; use class and improve CSS 
This changes the hard-coded style for what I'm calling the
content-with-donate-sidebar.  The advantage of not hard-coding style are
obvious, but I'm doing this now rather than later so that I can add
changes to the CSS that causes the width to extend to 100% on smaller
screen media when the donate bar disappears (the latter of which is
already implemented).
 2015-03-05 13:25:08 -08:00
Bradley M. Kuhn
44491e67fc Require browser even a bit bigger before left dt. 
(HT jgay)
 2015-03-05 13:18:55 -08:00
Bradley M. Kuhn
803698b2a8 Updated with more donations. 2015-03-05 13:09:03 -08:00
Bradley M. Kuhn
da3bb552d2 More donations. 2015-03-05 13:05:41 -08:00
Bradley M. Kuhn
726b29e9f2 Link to the larger one. 2015-03-05 13:00:53 -08:00
Bradley M. Kuhn
336b089791 Remove unnecessary clear: left. (HT hallabro) 2015-03-05 12:58:10 -08:00
Bradley M. Kuhn
ee18acf708 Align dd's properly on right. 2015-03-05 12:57:03 -08:00
Bradley M. Kuhn
8fa5b7f5da Update with more donations. 2015-03-05 12:20:27 -08:00
Bradley M. Kuhn
4a4448e3f0 Incorporate more donations into total. 2015-03-05 12:17:06 -08:00