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

336 commits

Author SHA1 Message Date
Martin Michlmayr
379b3aba75 Fix HTML syntax error - closing span 
Remove the closing </span> which was never opened.
 2016-05-07 20:10:11 -07:00
Karen M. Sandler
4cd5f38ffa fixing typo 2016-04-26 14:18:13 -04:00
Karen M. Sandler
9dc28858c8 adding timeline for donations to save enforcement 2016-04-26 14:16:33 -04:00
Karen M. Sandler
3c8d9abb43 Fix sizing of HPE logo 2016-03-30 22:21:38 -04:00
Karen M. Sandler
cafce402ef adding HPE logo to sponsors page 2016-03-30 21:56:01 -04:00
Bradley M. Kuhn
cd8f4d01e6 Remove PIA note now that there's a news item on it 2016-03-02 13:46:12 -08:00
Bradley M. Kuhn
fe5e5ae85d This min should no longer be here. 2016-03-02 13:39:39 -08:00
Bradley M. Kuhn
8fd57c8873 Add link here too. 2016-02-29 21:37:27 -08:00
Bradley M. Kuhn
e1a3628de1 add "to" 2016-02-29 21:32:58 -08:00
Bradley M. Kuhn
bc94606df3 Note PIA match was met. 2016-02-29 21:32:00 -08:00
Bradley M. Kuhn
776bc67fcf This span no longer belongs here. 2016-02-29 21:30:04 -08:00
Bradley M. Kuhn
40221fcc81 Change header to be how many more we need. 2016-02-29 21:27:33 -08:00
Bradley M. Kuhn
05652a27c1 Realize multiple todays. :) 2016-02-29 17:29:44 -08:00
Bradley M. Kuhn
ceda402a3e Change terminology. 2016-02-29 16:09:41 -08:00
Bradley M. Kuhn
eaeaa1d205 Typo fix in tag. 2016-02-29 15:16:47 -08:00
Bradley M. Kuhn
8992fd80cd Match clock is ticking; make it big and bold. 2016-02-29 15:12:52 -08:00
Bradley M. Kuhn
674f515ca1 temp change to use CC's copy of this image. 2016-02-25 12:25:49 -08:00
Bradley M. Kuhn
e99fbad26f Remove LCA match from top of every page. 2016-02-25 07:22:53 -08:00
Martin Michlmayr
47c8623c66 Fix alt tag for Collabora 
Thanks to Paul Wise for pointing this out.
 2016-02-18 16:36:33 -08:00
Bradley M. Kuhn
3b3a530cfc Fix link to Collabora. 2016-02-10 18:24:47 -08:00
Bradley M. Kuhn
169a27d9db Add Collabora as a sponsor. 2016-02-10 18:23:33 -08:00
Bradley M. Kuhn
9da32e252e Correct to possessive. 2016-02-06 19:05:24 -08:00
Bradley M. Kuhn
c8d44ca4c3 More changes to reference LCA match. 2016-02-05 15:26:19 +11:00
Bradley M. Kuhn
07daa54e8e LCA Match. 2016-02-05 15:18:18 +11:00
Bradley M. Kuhn
8122fc87dd Add URL of news item. 2016-02-01 13:35:21 -08:00
Bradley M. Kuhn
13ad6cfbdc Restore text for new group. 2016-02-01 10:48:20 -08:00
Bradley M. Kuhn
cb45d7e125 Correct typo in number. 2016-02-01 01:53:23 -08:00
Bradley M. Kuhn
725dce3ca8 Temporary message while still tallying. 2016-02-01 01:52:05 -08:00
Bradley M. Kuhn
3fe4a5bcbb Reduce ! in various site-wide fundraising texts. 
Surprisingly, given her predilection for exclamation points:

  <karen> yeah... believe it or not, I'd rather not have two exclamation points
          in the 750 achieved!  [20:30]

  <karen> and I would also delete the exclamation point after " enforcement
          efforts!" in the text above it  [20:31]

So this change is made on her behalf.
 2016-01-18 20:32:12 -08:00
Bradley M. Kuhn
2f92891db4 Use &amp; instead of and to save space. 2016-01-18 20:26:25 -08:00
Bradley M. Kuhn
f1e0fa5258 Switch to using variable here 2016-01-18 20:23:48 -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
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
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
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
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
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
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
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
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
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
99d3325e33 Create subtract filter. 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
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
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
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
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
689c3f5263 Update bar with note. 2015-04-02 07:42:13 -07:00
Bradley M. Kuhn
f0182678c6 Overview is now on about page. 2015-03-24 15:40:24 -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
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
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
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
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
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
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
d986913e3c Updated with additional donations. 2015-03-08 09:32:59 -07: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
c9442b9ae0 Slight increase. 2015-03-07 12:11:43 -08:00
Bradley M. Kuhn
718bad4a65 Additional donations imported. 2015-03-06 17:20:29 -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
9484482e19 Additional donations. 2015-03-05 22:30:22 -08:00
Bradley M. Kuhn
b271e87e26 Updated total. 2015-03-05 15:21:14 -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
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
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
Martin Michlmayr
9cd9c2b5d0 Fix HTML syntax errors 2015-03-05 14:18:39 -05: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
51d69d5f16 Truly remove Overview from the menu. 2015-03-05 07:55:06 -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
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
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
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
f7425dc802 Only display paginator if multiple pages. 2015-03-04 15:28:44 -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
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