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