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

149 commits

Author SHA1 Message Date
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