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

1097 commits

Author SHA1 Message Date
Bradley M. Kuhn
f1e0fa5258 Switch to using variable here 2016-01-18 20:23:48 -08:00
Bradley M. Kuhn
c6af56f2a6 Unclear what this should be, testing this value. 2016-01-18 20:22:17 -08:00
Bradley M. Kuhn
9813a0795f When we're at the middle goal, drop it immediately. 2016-01-18 20:18:49 -08:00
Bradley M. Kuhn
fd261def3a And variable needs correction as well. 2016-01-18 20:17:37 -08:00
Bradley M. Kuhn
e6e5bec6b4 This is the final goal, not the middle goal. 2016-01-18 20:15:45 -08:00
Bradley M. Kuhn
cffc81b5d8 Prepare for Supporters beyond 750. 
After the next import, we'll have more than 750 supporters.  This change
not only handles that fact, but adds sufficient Javascript and Django
templating to handle the case if the Supporter count for any reason
drops below 750 again.
 2016-01-18 19:50:08 -08:00
Bradley M. Kuhn
5d0969ec11 Update sponsors page based on recent commitments. 2016-01-17 20:49:27 -08:00
Bradley M. Kuhn
5847bc3b3e Improve Supporter appeal re: number of Supporters 
The Supporter appeal didn't discuss the two different targets in much
detail.  This change explains a bit better where the "service split" is
between what we can do with 750 Supporters vs. 2,500 Supporters.

Karen helped with this change.
 2016-01-08 13:06:28 -08:00
Bradley M. Kuhn
fb55eebdc1 Add link to announcement of campaign in template. 
Since the details of what it means to "count twice" are in that
announcement, we should link to it here.
 2016-01-08 12:29:59 -08:00
Bradley M. Kuhn
bc3eb80d40 Left Margin is too long. 2015-12-30 07:35:08 -08:00
Bradley M. Kuhn
5ab2dca89c I don't think justify is correct here. 2015-12-30 07:32:37 -08:00
Bradley M. Kuhn
eeeb084142 Move from #mainContent to #container #mainContent 
A few adjustments as well.
 2015-12-30 07:31:22 -08:00
Bradley M. Kuhn
11c6829c9d More suggestions from j-b. 
<j-b> and also fixed the background from #fffff; to #ffffff;
 2015-12-30 07:27:52 -08:00
Bradley M. Kuhn
4cdde460f8 Improvements suggested by j-b on IRC. 
I didn't take all his suggestions, but a few.
 2015-12-30 07:26:21 -08:00
Bradley M. Kuhn
14ebd89ad4 Links to more conferences. 2015-12-30 04:41:54 -08:00
Bradley M. Kuhn
e58150f58c Update totals of payments made 
Also move payments together.
 2015-12-30 04:40:22 -08:00
Bradley M. Kuhn
e1f731b265 Maybe no <p> at all is ok? 2015-12-26 06:54:42 -08:00
Bradley M. Kuhn
956945ff26 Just wrap the whole thing in the <p>. 
I don't know why we needed that subbox anyway.

Previous commit definitely did not work.
 2015-12-26 06:51:40 -08:00
Bradley M. Kuhn
3932a4575f validator did not like this: 
Element form not allowed as child of element span in this
context. (Suppressing further errors from this subtree.)

So, I moved the id into the form rather than a span.
 2015-12-26 06:50:26 -08:00
Bradley M. Kuhn
740f61c8ae validator says <p> around <span> is bad. 2015-12-26 06:45:00 -08:00
Bradley M. Kuhn
766d3ebf54 Change order and a few wording changes. 2015-12-24 16:57:20 -08:00
Bradley M. Kuhn
cc655f38bd Be consistent about names of social networks. 
Also, a grammar fix.
 2015-12-24 16:55:19 -08:00
Bradley M. Kuhn
822b9b1fcf Add title to this text. 
Most browsers popup the title= attribute on mouse-over.
 2015-12-24 14:21:47 -08:00
Bradley M. Kuhn
78c4aad43a Actually, got to 632. 
The new match was 416 *more*, so it's 416+216=632
 2015-12-24 07:52:09 -08:00
Bradley M. Kuhn
42c9866cae New match from Private Internet Access. 2015-12-24 07:23:16 -08:00
Bradley M. Kuhn
c7f50fdf21 Merge mina86' changes. 2015-12-21 17:19:05 -08:00
Michal Nazarewicz
8b75276d5a Fix gradients broken by previous commit. 
[0d89044: Replace gradient images with CSS gradients.] replaced gradient
images with CSS gradients but in doing so changed some of them from
light blue to gold.  Change the colours to correct ones where necessary.
 2015-12-22 02:07:46 +01:00
Michal Nazarewicz
c92be7d12f [PATCH] Update link to git sources. 2015-12-21 11:11:42 -08:00
Michal Nazarewicz
0d89044354 [PATCH 2/2] Replace gradient images with CSS gradients. 2015-12-21 11:09:02 -08:00
Michal Nazarewicz
828baca5a6 [PATCH 1/2] Fix unnucessary horizontal scroll bar; simplify header markup. 
Because #logobutton had a fixed width, browser window narrower than 933
pixels resulted in an unnecessary horizontal scroll bar.  Fix that by
using a dynamic 100% width which results in the header image being
automatically clipped as necessary.

To avoid clipping the tree and the text though, include min-width so
that very narrow windows result in a horizontal scroll bar so the whole
name can be seen.

Furthermore, simplify the markup by removing wrapper DIV and SPAN
elements which weren’t really necessary.  As a consequence of that
change, the whole top of the page is now a link to the homepage (i.e.
‘/’).  Prior to this change, the link wasn’t clickable.
 2015-12-21 11:09:02 -08:00
Bradley M. Kuhn
1c62ecc521 Add Renewal button. 2015-12-21 09:37:14 -08:00
Bradley M. Kuhn
d9f32e4093 Properly close tags. 2015-12-21 09:33:56 -08:00
Bradley M. Kuhn
8eb5bb188b Spacing changes 2015-12-21 09:33:24 -08:00
Bradley M. Kuhn
22c5d34ece Remove redundant tag. 2015-12-21 09:33:15 -08:00
Bradley M. Kuhn
b64e6a0491 Move renewal to bottom. 2015-12-21 09:29:31 -08:00
Bradley M. Kuhn
566324fbcb One of the hide's was missing. 2015-12-21 09:29:21 -08:00
Bradley M. Kuhn
f1c924b07e Create renewal option on form. 
This adds a renewal option to the form.
 2015-12-21 09:25:04 -08:00
Bradley M. Kuhn
a492430379 Failed to upload this total as well. 
Bar was not updating from the right without this change.
 2015-12-18 15:42:10 -08:00
Bradley M. Kuhn
4b5dbc98dc Remove duplicate Twitter link. 2015-12-18 12:13:35 -08:00
Bradley M. Kuhn
0351bf48c2 Make the archive link not so prominent. 2015-12-18 12:13:11 -08:00
Bradley M. Kuhn
08359ceba7 More social networking links. 2015-12-18 12:12:21 -08:00
Bradley M. Kuhn
880a3d7660 Whoops! You have to use summary for the right one. 2015-12-18 12:08:43 -08:00
Bradley M. Kuhn
5368c0a8b7 Actually implement up to 5 blogs in template. 
The early change to frontpage.py was not sufficient; the template
obviously needs to make use of those five blog posts as well.

Note the cascading effect here.  We only put lots on the front page if
they are recent.
 2015-12-18 12:06:57 -08:00
Bradley M. Kuhn
b5eaeb9919 Note that we're a charity on the front page. 2015-12-18 12:02:22 -08:00
Bradley M. Kuhn
f1d313fdbc Link to Copyleft Compliance more fully. 
We had a link to copyleft.org before, which I remove here, and put a
more general link to the copyleft compliance work.
 2015-12-18 12:00:52 -08:00
Bradley M. Kuhn
1704584f34 Allow up to 5 blog posts on the front page. 
We have a lot of blog posts at the moment.
 2015-12-18 11:59:03 -08:00
Bradley M. Kuhn
84cb9a2b85 Sizing class for images on the blog. 2015-12-18 11:57:00 -08:00
Bradley M. Kuhn
d47e71942b David Marin and family no longer a sponsor. 2015-12-18 09:53:07 -08:00
Bradley M. Kuhn
9bc9370f21 New Supporter match starts today! 2015-12-18 09:37:07 -08:00
Bradley M. Kuhn
b15f9a9bc4 Remove Black Duck from Sponsors page. 2015-12-13 11:00:08 -08:00
Bradley M. Kuhn
788880d092 Add legacy support for older firefox/iceweasel. 
In this situation:

<body class="conservancy-blog">
...
<video>

it turned out that this CSS:

body.conservancy-blog video {}

Did not apply.

So, this adds a hack to force the issue.
 2015-12-11 13:17:53 -08:00
Bradley M. Kuhn
59c6aa64de Add margins for videos. 2015-12-11 11:20:32 -08:00
Bradley M. Kuhn
2ec25639c9 Improved CSS for video tags on our blog. 2015-12-11 10:37:11 -08:00
Bradley M. Kuhn
7d97c3132f Correct the URL once again. 2015-12-09 12:11:21 -08:00
Bradley M. Kuhn
48783bea80 Correct Google Plus URL. 2015-12-09 11:58:34 -08:00
Bradley M. Kuhn
35a4864e61 Add other social media at bottom of page. 2015-12-09 11:43:40 -08:00
Bradley M. Kuhn
b48b1ab1e5 Avoid query string passed along in rendering. 
This middleware is a bit of a mess anyway, since it's basically using
static files as templates.  However, we definitely don't want to add any
GET query parameters rendered into the path name.
 2015-12-07 12:24:58 -08:00
Bradley M. Kuhn
e8b4681da3 Match goes until next Tuesday. 2015-12-01 07:41:14 -08:00
Bradley M. Kuhn
e0ba6b86bd Correct number. 2015-12-01 07:32:28 -08:00
Bradley M. Kuhn
8af2ce722b New match for another 50. 2015-12-01 07:27:27 -08:00
Bradley M. Kuhn
79eeb2acf0 second endif removed. 2015-11-30 20:38:20 -08:00
Bradley M. Kuhn
d305f5103f Implement min filter. 2015-11-30 20:33:14 -08:00
Bradley M. Kuhn
20d3accd3c linux-compliance is now copyleft-compliance. 
urls.py must change for this too.
 2015-11-30 20:08:44 -08:00
Bradley M. Kuhn
23576d7878 Link index to new supporter appeal. 2015-11-30 20:03:38 -08:00
Bradley M. Kuhn
c0fde4c92d Move forms.css to css directory. 2015-11-30 19:19:47 -08:00
Bradley M. Kuhn
9897e3d9ce Changes to support the appeal placement of picture 2015-11-30 19:19:47 -08:00
Bradley M. Kuhn
b3d18b59cb Sizing of fundraising text on the top of each page. 2015-11-30 19:19:47 -08:00
Bradley M. Kuhn
389c94d967 Cause fundraising bar to disappear more quickly. 2015-11-30 19:19:47 -08:00
Bradley M. Kuhn
a8d53ca1dd Copyleft Principles is now on the side menu. 2015-11-30 19:19:46 -08:00
Bradley M. Kuhn
2b76361756 Attempt to improve fonts. 
I noticed after I updated to jessie that fonts displayed strangely in
some browsers.  I still have strange fonts on our website with Chromium,
but this change seems to have helped iceweasel.
 2015-11-30 19:19:46 -08:00
Bradley M. Kuhn
963c023eab site-wide supporter count fundraiser. 
Using the jQuery UI multiprogress bar added earlier, this change allows
display of the of the progress bar on every page.
 2015-11-30 19:19:46 -08:00
Bradley M. Kuhn
61ecfd8341 Move supporter-page.js into js directory. 2015-11-30 19:19:46 -08:00
Bradley M. Kuhn
edcde9f053 Add text for site fundraiser to every page. 
By adding this text to the base template, we add this to every page on
the site.
 2015-11-30 19:19:46 -08:00
Bradley M. Kuhn
fdfbb6d65d Move CSS file for Conservancy to CSS directory. 2015-11-30 19:19:46 -08:00
Bradley M. Kuhn
f8af05630d Donate page encourages people to become Supporters 2015-11-30 19:19:46 -08:00
Bradley M. Kuhn
99d3325e33 Create subtract filter. 2015-11-30 19:19:46 -08:00
Bradley M. Kuhn
5c4cc1e2e1 Add sitefundgoal to top level view context. 
The base template now has access to the fund-raising goal that will be
displayed site-wide.  The view here must provide it in the context for
access everywhere.

Furthermore, we need a local context processor to make sure it's in
context everywhere, and we have to make sure that context is properly
passed along.

This code is a bit cargo-culted in, based on what I read in various
places about adding the Request context.
 2015-11-30 19:19:46 -08:00
Bradley M. Kuhn
e1dfd65c3a All included via base_conservancy.html template 
jQuery, jQuery UI, and the supporter-page Javscript are now included via
the base_conservancy.html template.
 2015-11-30 19:19:46 -08:00
Bradley M. Kuhn
16399575f1 Update thank you page slightly for Supporter. 2015-11-30 19:19:46 -08:00
Bradley M. Kuhn
02c4c71491 Add id for busybox. 2015-11-30 19:19:46 -08:00
Bradley M. Kuhn
0287a2b6bc Add Bro member project. 2015-11-30 19:19:46 -08:00
Bradley M. Kuhn
21b388b7ba Add copyright aggregation project for Debian. 2015-11-30 19:19:46 -08:00
Bradley M. Kuhn
54e0df82d1 Add Godot member project. 2015-11-30 19:19:46 -08:00
Bradley M. Kuhn
680c2898b2 Add QEMU member project. 2015-11-30 19:19:46 -08:00
Bradley M. Kuhn
ee938d1000 phpMyAdmin no longer supports Drizzle. 2015-11-30 19:19:46 -08:00
Bradley M. Kuhn
40339994ee Add ODT and PDF of FSA template. 
These are the currently in production versions of the FSA.  The LaTeX
version is sadly not being maintained by those in charge of drafting
changes now.
 2015-11-30 19:19:46 -08:00
Bradley M. Kuhn
506cd5ebdf Small changes in messaging of compliance work. 
* Direct link to Principles from Compliance menu.

  * Favor the phrase Copyleft Compliance over just Linux Compliance.
 2015-11-30 19:19:46 -08:00
Bradley M. Kuhn
42117ddb1e Remove fundraiser details and just say: Compliance 2015-11-30 19:19:46 -08:00
Bradley M. Kuhn
c60532d863 base_conservancy.html includes jQuery now. 2015-11-30 19:19:45 -08:00
Bradley M. Kuhn
f0acec6304 Use humanize for number formatting. 2015-11-30 19:19:45 -08:00
Bradley M. Kuhn
ab2e754b9c Images from Karen's visit to the KCC. 2015-11-30 19:19:45 -08:00
Bradley M. Kuhn
c3afcad9a5 Images for use on the new supporter appeal page. 2015-11-30 19:19:45 -08:00
Bradley M. Kuhn
63aa13ac23 Proper update to jQuery 1.7.2 and jQuery UI 1.8.22 2015-11-30 19:19:45 -08:00
Bradley M. Kuhn
23c2ac2845 Clarify text that not all sponsors are here. 
Some sponsors remain anonymous.  This text should reflect that.
 2015-11-30 19:19:45 -08:00
Bradley M. Kuhn
5f3661b90b Remove sponsors who did not renew their support. 2015-11-30 19:19:45 -08:00
Bradley M. Kuhn
3612338787 Soften language on monthly supporter benefit issue 
Monthly supporters actually do currently receive their t-shirt when
they've given at least $60.  They also are listed immediately.

In an effort to make monthly Supporters feel a bit better about the
delay, this text is improved to explain the situation a bit better.
 2015-11-30 19:19:45 -08:00
Bradley M. Kuhn
96fa4951fa Attempt to be a bit clearer about monthly. 2015-11-30 19:19:44 -08:00
Bradley M. Kuhn
c5a5b17d7b Various improvements and changes. 
* Correct URLs not to include Conservancy's own site.

 * Various wording changes.

 * Some HTML formatting fixes.
 2015-11-30 19:19:44 -08:00
Bradley M. Kuhn
5e2d159ea1 Add blank line. 2015-11-30 19:19:44 -08:00
Bradley M. Kuhn
25fe9d6f8b Properly insert images. 2015-11-30 19:19:44 -08:00