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

1036 commits

Author SHA1 Message Date
Karen M. Sandler
fc699fef07 edits to Bradley's revisions, adding Jeremy's comments 2015-11-30 19:19:44 -08:00
Bradley M. Kuhn
6f5f5c8949 Some wording improvements. 2015-11-30 19:19:44 -08:00
Bradley M. Kuhn
fdff9bd4c2 I think these are supposed to be mdash'es. 2015-11-30 19:19:44 -08:00
Bradley M. Kuhn
39a7c1efb4 Change emphasis. 2015-11-30 19:19:44 -08:00
Bradley M. Kuhn
7e357a316f Add a few more items to Karen's bullet list here. 2015-11-30 19:19:44 -08:00
Bradley M. Kuhn
5fd1e37321 Summary paragraph about dire situation at top. 2015-11-30 19:19:44 -08:00
Bradley M. Kuhn
cea2f76a92 Fill paragraphs, no substantive change. 2015-11-30 19:19:44 -08:00
Bradley M. Kuhn
dfa8b2db02 Fix bad HTML tag. 2015-11-30 19:19:44 -08:00
Karen M. Sandler
0baa06870f with Jeremy's suggestions. 2015-11-30 19:19:44 -08:00
Karen M. Sandler
bb409cc571 draft as sent to budget/finance committee 2015-11-30 19:19:44 -08:00
Bradley M. Kuhn
29b997a50e Fork from original-supporter-appeal.html. 
This new appeal file will be a rewrite of the original supporter appeal.
 2015-11-30 19:19:44 -08:00
Bradley M. Kuhn
41d033256c Point index.html as a symlink. 2015-11-30 19:19:44 -08:00
Bradley M. Kuhn
dd749c9085 Rename index file to what it actually was. 2015-11-30 19:19:44 -08:00
Bradley M. Kuhn
1a612c75ed Multi-progress bar support. 
Source code can be found for this at:

https://github.com/j-ulrich/jquery-ui-multiprogressbar
 2015-11-30 19:19:44 -08:00
Bradley M. Kuhn
e358835058 Switch to jQuery 1.7.2 and jQuery UI 1.8.22 custom 2015-11-30 19:19:43 -08:00
Bradley M. Kuhn
7f78638faf Moved js and css from top level to subdirs 2015-11-30 19:19:43 -08:00
Bradley M. Kuhn
8ea5fb81c8 Link to jquery & supporter JavaScript in template. 
Used for everything in Conservancy now.
 2015-11-30 19:19:43 -08:00
Bradley M. Kuhn
b15c250eab Add <br/> tag. 2015-11-30 19:19:43 -08:00
Bradley M. Kuhn
6bf7155d69 Correct duplicate word. 2015-11-30 19:19:43 -08:00
Bradley M. Kuhn
2bf15efb39 Martin Michlmayr replaces Brown as Treasurer. 
Brown resigned on 2015-03-01 from the Treasurer position as well.
Martin was elected as his replacement.
 2015-11-29 12:46:46 -08:00
Bradley M. Kuhn
f193ba8cd3 Note that filings are now due on 2016-01-15. 2015-11-29 12:37:28 -08:00
Bradley M. Kuhn
796d2247df Note first 8868 extension publicly. 2015-11-29 12:36:45 -08:00
Bradley M. Kuhn
e0cc78b27c Annual report for FY 2013. 
Include links from the filings page.
 2015-11-29 12:36:13 -08:00
Bradley M. Kuhn
6d9f0d6aeb Deb Nicholson joins the Eval Committee. 2015-11-29 12:33:41 -08:00
Bradley M. Kuhn
9136e6ec2c Tom Marble joins the Eval Committee. 2015-11-29 12:33:32 -08:00
Bradley M. Kuhn
3f85671239 Karl Fogel joins the Eval Committee. 2015-11-29 12:33:22 -08:00
Bradley M. Kuhn
6b8a0800f6 Evan Prodromou resigned from Eval Committee. 
Evan no longer had time to serve on the committee.
 2015-11-29 12:32:46 -08:00
Bradley M. Kuhn
5088902128 Add additional pro bono counsel law firm. 2015-11-29 12:31:22 -08:00
Bradley M. Kuhn
b239fccb85 add id in the h2 tag to find ravicher by link. 2015-11-29 12:31:06 -08:00
Bradley M. Kuhn
84e426f42d Peter Brown no longer on Board of Directors. 
Peter Brown left the Conservancy Board of Directors to focus on his new
job effective 2015-03-01.
 2015-11-29 12:29:56 -08:00
Bradley M. Kuhn
577fee343f Link to PDF in Korean; Reformat top links. 2015-11-29 12:26:58 -08:00
Bradley M. Kuhn
1e1fd78375 Improve formating and linkage to match original. 
KCC put this originally on their own website.  By inspecting that, I was
able to match some of their formatting a little bit better.
 2015-11-29 12:26:03 -08:00
Bradley M. Kuhn
b20a90f2fa Korean translation of GPL Enforcement Principles. 
This translation was kindly done by the Korean Copyright Commission.
 2015-11-29 12:23:49 -08:00
Bradley M. Kuhn
7a35d48558 Update title and other Django tag fixes. 2015-11-29 12:22:22 -08:00
Bradley M. Kuhn
ad758d870d Add copyright notice and license of document. 
Upon agreement of all the authors mentioned in the earlier commit and
listed herein, the license of the document is as this commit describes.
 2015-11-29 12:21:32 -08:00
Bradley M. Kuhn
8d362bbf9e Fix missing close tag. 2015-11-29 12:21:00 -08:00
Bradley M. Kuhn
efae6e0921 First publication of GPL Enforcement Principles. 
Bradley M. Kuhn wrote the first draft of these principles on 23 May
2015.  They were from there rewritten collaboratively over the following
months with the participation (in chronological order) of Karen
M. Sandler, W. John Sullivan, and Allison Randal.

This commit is the first publication of the principles on 1 October
2015.
 2015-11-29 12:15:47 -08:00
Bradley M. Kuhn
abe226a6f4 Rewrite page; fully discuss all compliance effort 
This about page now talks about all of Conservancy's compliance efforts.
 2015-11-29 12:13:39 -08:00
Bradley M. Kuhn
17c9edbc60 Symlink for page should now point to about.html. 
Now that the VMware case has been running a few months, we should point
this symlink properly to the general about for the project.
 2015-11-29 12:10:00 -08:00
Bradley M. Kuhn
78b1afce79 Correct information to match how long ago. 2015-11-29 12:09:26 -08:00
Bradley M. Kuhn
0f14e848ac Correct link to video. 
FSF seems to have moved this video to somewhere else.
 2015-11-29 12:08:32 -08:00
Bradley M. Kuhn
d01295b6c0 Additional facts from in 2015-10-28 announcement. 
The news announcement posted on Conservancy's site on 2015-10-28 at:
   https://sfconservancy.org/news/2015/oct/28/vmware-update/

had additional facts.  This commit incorporates those into the FAQ.

Additionally, a link to additional technical materials was also provided
that day.
 2015-11-29 12:03:58 -08:00
Bradley M. Kuhn
8899d0d08d Change title of page to reflect Copyleft generally 2015-11-29 12:00:02 -08:00
Bradley M. Kuhn
e4be56c968 Rename: linux-compliance -> copyleft-compliance 2015-11-29 11:49:42 -08:00
Bradley M. Kuhn
30b1a3d23d Correct attr in lookup as well. 2015-05-09 17:34:49 -07:00
Bradley M. Kuhn
97ab9c7541 Correct lookup of attribute. 2015-05-09 17:33:51 -07:00
Bradley M. Kuhn
4d4f520900 Correct keys to be the code name of the fundraiser 2015-05-09 17:31:47 -07:00
Bradley M. Kuhn
8df76219f8 Get an empty dict & no error when attrs not there 2015-05-09 17:29:08 -07:00
Bradley M. Kuhn
87a658a6b6 correct variable name. 2015-05-09 17:25:25 -07:00
Bradley M. Kuhn
e8a5795a2c Correct method name. 2015-05-09 17:12:34 -07:00
Bradley M. Kuhn
1588fa5d81 Correct method name. 2015-05-09 17:04:38 -07:00
Bradley M. Kuhn
9dab283774 Generate JSON output of a fundraiser data 
Allow public interface to query the fundraiser data.
 2015-05-09 16:50:32 -07:00
Martin Michlmayr
6563803287 Fix HTML syntax errors 2015-04-21 10:19:23 -04:00
Bradley M. Kuhn
9e23a7c034 Add scaled vrsion of picture. 2015-04-20 12:50:56 -07:00
Bradley M. Kuhn
0bd00f81ec Yes,they're generous, but text is too long for box 2015-04-03 09:46:09 -07:00
Bradley M. Kuhn
4ed58f2867 Don't duplicate donate now in the text. 2015-04-03 09:45:17 -07:00
Bradley M. Kuhn
898310fde9 Updates to note completion of match goal. 2015-04-03 09:44:24 -07:00
Bradley M. Kuhn
72876cedab Update to denote end of $50k match goal period. 
Include link to announcement..
 2015-04-03 09:40:42 -07:00
Bradley M. Kuhn
42d832af31 Correct height of progress bar (HT tmarble) 
This should be em, not a px size, since text will appear inside it.
 2015-04-02 12:55:34 -07:00
Bradley M. Kuhn
e2d2505a9a Formatting looks weird without an new <p> 2015-04-02 09:06:12 -07:00
Bradley M. Kuhn
d8e334eaca Fix grammar. 2015-04-02 09:05:01 -07:00
Bradley M. Kuhn
383c53d718 Add video to the appeal page. 2015-04-02 09:03:13 -07:00
Bradley M. Kuhn
cacb6d2eff Fix s/today/tomorrow/ 2015-04-02 07:49:43 -07:00
Bradley M. Kuhn
689c3f5263 Update bar with note. 2015-04-02 07:42:13 -07:00
Bradley M. Kuhn
d6aa5682d9 Add comma 2015-04-02 07:38:35 -07:00
Bradley M. Kuhn
4599a89ef0 Add heading as directed by Karen. 2015-04-02 07:37:30 -07:00
Bradley M. Kuhn
d43b2fa178 Change to last month, since it's April 2015 now. 2015-04-02 07:33:23 -07:00
Bradley M. Kuhn
02d97d1a72 Additional feed_dict deprecation issue. 
This use of feed_dict was not properly corrected when changes were made
due to feed_dict deprecation.
 2015-03-31 08:43:13 -07:00
Bradley M. Kuhn
d8f86fed28 Add two additional statements of support. 2015-03-31 08:06:56 -07:00
Bradley M. Kuhn
f0182678c6 Overview is now on about page. 2015-03-24 15:40:24 -07:00
Bradley M. Kuhn
155ae811ee Change date-based intro to appeal. 2015-03-23 09:37:13 -05:00
Bradley M. Kuhn
79eae5e62d Ensure pre tag has a scroll when necessary. 2015-03-21 16:27:53 -04:00
Bradley M. Kuhn
0dc6e0bd1d Entities needed for <, > characters in <pre> 2015-03-21 10:43:12 -04:00
Bradley M. Kuhn
ed1c7c2653 Add id attribute for statements of support. 2015-03-21 10:38:19 -04:00
Bradley M. Kuhn
ea9a59c551 Improve FAQ entry: VMware violation tech example 
Add additional information and details about the technical details of
the VMware violation.  This extends the existing example with more
detail and improves various other parts related in the FAQ.
 2015-03-21 10:31:07 -04:00
Bradley M. Kuhn
83c97a0029 Perform math on number variable without comma 
The math performed for the number of donors should be done on the number
without the comma, so that NaN doesn't show on the site.
 2015-03-21 10:03:28 -04:00
Bradley M. Kuhn
0b026888d9 Add GNOME Foundation statement of support. 2015-03-17 11:33:04 -07:00
Bradley M. Kuhn
39584e54f9 Wordsmith this new FAQ entry. 2015-03-16 19:37:50 -07:00
Bradley M. Kuhn
fed9826bc0 Add note to reiterate shim layer answer. 
It appears that some in the media believe the understand above says the
opposite, so I've corrected it.
 2015-03-16 19:05:50 -07:00
Bradley M. Kuhn
b59142e32c Merge branch 'master' from upstream changes. 2015-03-12 10:09:27 -07:00
Bradley M. Kuhn
9c5db11d44 Update website license notice to CC BY SA 4.0 
The update to the license grant text was already true by implication,
but now it is explicit.
 2015-03-12 10:08:50 -07:00
Martin Michlmayr
bf5ec653b1 Fix HTML syntax errors 2015-03-12 10:32:06 -06:00
Martin Michlmayr
8733c7b02a Grammar fix 2015-03-12 10:19:31 -06:00
Bradley M. Kuhn
6054ab657a Link to copyleft.org to explain CCS. 2015-03-12 08:49:45 -07:00
Bradley M. Kuhn
0ed82d00cb Add missing <dd> tag. 2015-03-12 08:45:18 -07:00
Bradley M. Kuhn
a7b2838175 Add three new statements of support. 2015-03-12 08:34:38 -07:00
Bradley M. Kuhn
14ce1e4efb Remove blank line. 2015-03-12 08:31:57 -07:00
Bradley M. Kuhn
3a9199732b Fix HTML formatting error. 2015-03-12 08:31:11 -07:00
Bradley M. Kuhn
cf527ba5db Spelling check. 2015-03-12 08:04:02 -07:00
Bradley M. Kuhn
0bef523d2f Grammar fix. 2015-03-12 08:02:40 -07:00
Bradley M. Kuhn
b197649e02 Should be a , not a . 2015-03-12 08:01:27 -07:00
Bradley M. Kuhn
7fbd1fd36f VMware lawsuit FAQ: id tags for two items. 2015-03-12 08:00:56 -07:00
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