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

1121 commits

Author SHA1 Message Date
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
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
Bradley M. Kuhn
604958a93d At least this much in donation have come in so far 2015-03-05 12:09:29 -08:00
Bradley M. Kuhn
4b2bb32811 Adjust widths slightly when these are combined. 
When we have both dt's and the donate-sidebar floating around, things
get tight.  Perhaps there is a better solution than this (e.g., can you
set the @media conditional on there being a donate-sidebar at all?), but
this should be a reasonable hack to fix the problem.
 2015-03-05 12:00:42 -08:00
Bradley M. Kuhn
ba453a80c2 Avoid left floating dt's on small screens. 
Set the min-width for the left-floating dt's to 550px, so that small
screens just get everything in one column.

Note that the formatting previously used is now moved purely to @media,
which I don't know how that will impact browsers that don't support
@media in CSS, but OTOH, I believe the graceful degradation is done
correctly here.
 2015-03-05 11:56:22 -08:00
Bradley M. Kuhn
11af508b99 Merge branch 'master' from gitorious. 
I made some changes before a pull which are herein merged.
 2015-03-05 11:36:53 -08:00
Bradley M. Kuhn
05198edf82 Make FAQ entry done in dt look better with CSS. 
This is accomplished by three key changes:

  * use em rather than px sizes, so that font changes are accomodated.

  * Add a margin to the dt.

  * center the text in the dt's rather than right align.
 2015-03-05 11:35:15 -08:00
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