Bradley M. Kuhn
63f6bab95f
Supporters: Ladies sizes in 2XL now available.
...
Add Ladies sizes in 2XL to the form. They're already in the internal
database, so the import script should find them easily.
2017-09-26 09:56:22 -07:00
Brett Smith
f1214a3c93
projects: Add Policies section with travel policy.
2017-09-22 10:44:52 -04:00
Brett Smith
4367de57d1
sponsors: New logo from Target.
2017-09-19 12:56:45 -04:00
Bradley M. Kuhn
477e9f4c02
Blog: typo fix in template.
...
Template had a typo from last commit.
2017-09-13 09:46:38 -07:00
Bradley M. Kuhn
bea2e11108
Blog: add permalink on partial entries.
...
I noticed there is no link on the blog pages (other than on the front
page) to get the link to the blog post itself. This adds a permalink at
the end near the tags.
I considered making the title itself a link, which is what's done on the
frontpage, but I figured this might look nicer. Feel free to change
this if you're looking this commit message and feel I didn't DTRT
here. :)
2017-09-13 09:42:08 -07:00
Brett Smith
c91fc65984
base template: Remove match progressbar.
2017-03-02 09:41:01 -05:00
Bradley M. Kuhn
b0044afc9c
Extend deadline.
2017-02-13 21:55:25 -08:00
Brett Smith
6e25a6e084
base: Start progressbar for new match.
...
This code should be easier to adapt to future matches too, by just changing
the constants in the first `with` declaration and whatever text is desired.
2017-02-03 13:56:36 -05:00
Brett Smith
40133bb73b
supporter: Remove bogus value for PayPal srt variable.
...
srt is meant to be used for time-limited subscriptions. 0 is not a valid
value. See
<https://developer.paypal.com/docs/classic/paypal-payments-standard/integration-guide/Appx_websitestandard_htmlvariables/#recurring-payment-variables >.
It's optional, and leaving it unset gives us the behavior we want, so do
that instead.
2017-02-03 10:34:14 -05:00
Brett Smith
36adfb406d
supporter: Set LC for all PayPal forms.
...
This setting is not subscription-specific, so if we ever do it it seems like
we should always do it.
2017-02-03 10:32:45 -05:00
Brett Smith
bb888146ff
base: Remove match progressbar.
2017-01-23 20:59:16 -05:00
Bradley M. Kuhn
d282115127
Add link to signup.
2017-01-22 23:21:41 -08:00
Bradley M. Kuhn
cab182b862
More changes that Karen told me to make.
2017-01-22 23:21:02 -08:00
Bradley M. Kuhn
57597f3a5c
Move let's sentence per Karen's instructions.
2017-01-22 23:17:48 -08:00
Bradley M. Kuhn
7815c083dc
Fix where PIA is mentioned in both versions.
2017-01-22 23:13:12 -08:00
Bradley M. Kuhn
cec947d2c3
Change based on karen's text.
2017-01-22 23:12:24 -08:00
Bradley M. Kuhn
1fd5e015b5
Note this goes AoE time.
2017-01-22 17:15:22 -08:00
Brett Smith
6a73864765
base_conservancy: PIA match is extended one week.
2017-01-16 17:03:42 -05:00
Brett Smith
7202787092
supporter: Reorganize form post-input notes.
...
This makes it easier to keep baseline alignment between labels and their
respective inputs. Declaring `margin-left: 51%;` for the post-input notes
is not exactly what we want, but it's much closer and less troublesome than
dealing with the vertical alignment of labels otherwise.
2017-01-09 16:56:42 -05:00
Brett Smith
5f9a4395f3
supporter: Add size information chart.
2017-01-05 13:46:46 -05:00
Brett Smith
27b469c2dc
sponsors: Unlist too-old sponsors.
...
These companies have not given in the past year.
2017-01-04 12:03:28 -05:00
Brett Smith
c07b274681
supporter: Set target="_blank" on informational links in the forms.
2017-01-02 11:43:22 -05:00
Brett Smith
0de3594e74
supporter: Group shirts by type.
2017-01-02 11:24:14 -05:00
Brett Smith
f32d04e725
supporter: Women's shirts, not ladies' shirts.
...
Signed off by Karen.
2017-01-02 11:20:13 -05:00
Brett Smith
b3a2f1dc96
supporter: Wordsmith the forms.
2017-01-01 16:38:12 -05:00
Brett Smith
2993a2c3ad
supporter: Fix detached labels in forms.
2017-01-01 16:31:01 -05:00
Brett Smith
fce05b6f99
supporter: Add tabindex to supporter sign-up form.
2017-01-01 16:10:21 -05:00
Brett Smith
b93cc61e8b
supporter: New form styling.
...
This makes better use of bigger screens, and degrades better to smaller
ones.
2017-01-01 15:10:20 -05:00
Brett Smith
8605b65783
supporter: Move more presentation rules to CSS.
...
This commit keeps the presentation basically the same, it just moves
presentation rules out of HTML and into CSS. It's not pixel-perfect but
pretty close.
2017-01-01 13:53:41 -05:00
Brett Smith
19e744788b
supporter: Only render the Annual form for upgraders.
...
This lets us do more with HTML and less with JavaScript, which is always
nice.
2017-01-01 10:53:58 -05:00
Brett Smith
b4883ca6bd
supporter: Make a partial for the supporter form.
...
This commit shouldn't make any substantial changes to the form or its
presentation. This is just cleaning things up as a development aid.
2017-01-01 10:39:23 -05:00
Brett Smith
78c474caac
supporter: Fix redundant annual/monthly/renewal ids.
2017-01-01 10:24:34 -05:00
Brett Smith
dad41f4817
supporter: Fix redundant os0 ids, invalid names.
2017-01-01 10:24:34 -05:00
Brett Smith
6392ae3a43
supporter: Fix redundant amount, error ids.
2017-01-01 10:24:34 -05:00
Brett Smith
7842ca6c57
supporter: Fix redundant no_shipping id.
2016-12-31 16:22:52 -05:00
Brett Smith
034a60be9b
js: Split whole-site JS from Supporter-specific JS.
2016-12-31 14:46:10 -05:00
Brett Smith
9ef8a62f0b
copyleft-compliance: Update old linux-compliance URLs.
2016-12-31 14:31:34 -05:00
Brett Smith
d5f461d879
news: Refactor press release rendering into a partial.
...
Same rationale as a few commits ago for blog entries.
2016-12-30 23:12:09 -05:00
Brett Smith
7f5f98e5db
news: Render HTML entities in press release titles.
...
Same rationale as for blogs a few commits ago.
2016-12-30 23:12:09 -05:00
Brett Smith
170aa38bb5
blog: Headlines clear floats.
...
This avoids a situation where multiple summaries have floats that stack on
top of each other vertically, which end up getting far away from the actual
text.
In order to make this work, we had to change the styling of #mainContent on
blog pages (and others with a sidebar). Otherwise, headlines with
class="clear" would clear the sidebar as well.
2016-12-30 23:12:09 -05:00
Brett Smith
e7c1171b6e
blog: Refactor entry rendering into a partial.
...
This helps ensure that entries are rendered consistently wherever they
appear.
2016-12-30 23:12:09 -05:00
Brett Smith
9fbc652c7c
blog: Mark entry headline safe in title.
...
We already strip tags, but this lets HTML entities render correctly.
2016-12-30 23:12:09 -05:00
Brett Smith
a3737e9955
supporter: Add id="renew" to the renewal form.
...
This provides better behavior for non-JavaScript visitors who use a #renew
link (see last commit).
2016-12-29 11:00:08 -05:00
Brett Smith
a95baef377
sponsors: Add Savoir-faire Linux.
2016-12-17 13:57:56 -05:00
Brett Smith
ebf5d317cc
sponsors: Add Linux Australia.
2016-12-17 13:52:32 -05:00
Bradley M. Kuhn
db4b90714b
Add comment about logo sizes.
2016-12-09 13:17:57 -08:00
Brett Smith
6fe13959a3
supporter: Support donors upgrading to supporters.
...
With a valid URL, a past donor can upgrade to a supporter by donating
the rest of the amount. Django validates the data and, if it passes,
puts it in the form. The JavaScript does most of the work from there.
2016-12-02 12:50:21 -05:00
Brett Smith
6908c135f2
appeal: Progress bar emphasizes current match program.
2016-12-02 10:09:12 -05:00
Brett Smith
4cbf566e31
contractpatch: Page layout adjustments.
...
Try to make sections clearer and avoid the "big monolith of text"
feeling.
2016-11-30 16:24:28 -05:00
Brett Smith
a1ec899670
css: Start a separate stylesheet for "big screen" styles.
...
I'm about to add more and I *suspect* this will be easier to maintain
in the long term, rather than duplicating the conditional many times.
2016-11-30 16:18:06 -05:00
Brett Smith
d0e3ad782e
contractpatch: Mark up page sections.
...
I'm going to do some styling on these but I'm not sure what yet.
2016-11-30 15:14:13 -05:00
Brett Smith
d663bcabdc
appeal: Another syntax fix.
2016-11-29 13:23:31 -05:00
Brett Smith
400ddf3969
appeal: Again.
2016-11-29 13:19:07 -05:00
Brett Smith
2a618a8830
appeal: Fix template syntax.
2016-11-29 13:16:13 -05:00
Brett Smith
5bd39ff315
appeal: Enhance progress text.
2016-11-29 13:14:53 -05:00
Brett Smith
df52029777
contractpatch: Fix syntax for previous silly commit.
2016-11-29 12:23:42 -05:00
Brett Smith
273be60679
contractpatch: Silly commit for testing.
2016-11-29 12:18:21 -05:00
Brett Smith
f0d9b1caec
appeal: Fundraising bar notes match.
2016-11-29 10:52:04 -05:00
Brett Smith
8fec6023e9
contractpatch: Add page.
2016-11-28 15:23:58 -05:00
Brett Smith
d0202d6b42
appeal: Restore middle goal to banner.
2016-11-22 08:44:10 -05:00
Brett Smith
01ab5892ba
appeal: Update for 2016.
2016-11-22 08:31:27 -05:00
Brett Smith
b331d52331
frontpage: Reorganize.
...
* Put news and blogs up front.
* Use 30 days as the cutoff for everything, consistently.
* Allow columns to collapse. Hopefully this is the start of a nicer
view on mobile.
* Reduce shading.
2016-11-17 10:40:22 -05:00
Brett Smith
88474ec876
blog: Display tags with dateline.
...
This hopefully makes it a little clearer which entry the tags apply to.
2016-11-17 09:53:50 -05:00
Brett Smith
c7a8375002
blog: Remove redundant datelines.
2016-11-17 09:49:57 -05:00
Brett Smith
6dcb9d35e3
blogs, news: Don't shade entries on listing pages.
...
This just causes entire pages to be shaded, which is undesirable.
2016-11-17 09:45:03 -05:00
Brett Smith
bb99d71fc1
frontpage: Remove announce subscription widget.
...
Due to subscription abuse, we had to enable a nonce in the Mailman
subscription form, which is non-trivial to reproduce here.
2016-11-16 17:10:40 -05:00
Brett Smith
0dce877d46
Reorder topnav buttons.
...
This better matches what I see on other NPO sites.
2016-11-16 16:42:17 -05:00
Brett Smith
5573738012
sponsors: Fix reversed dimensions on Target logo.
2016-11-09 12:38:37 -05:00
Brett Smith
1662bf983e
sponsors: Add Target.
2016-11-09 12:34:20 -05:00
Bradley M. Kuhn
99078190bd
s/enforcement/compliance/
...
Karen asked for this change.
2016-11-05 20:53:25 -07:00
Bradley M. Kuhn
811d2b70b4
Rename Members->Projects in menu navigation et al
...
Due to confusion about "members" and "supporters", we want at least the
menu navigation to not use the phrase "members" since some Supporters
expect that to refer to a type of donor.
While we will not be rebranding "member projects" fully at this time, we
want to favor the term projects.
A few additional changes, in particular moving files from members/ ->
projects/ directory will be needed in next commit.
2016-09-30 13:46:51 -04:00
Bradley M. Kuhn
9682d113c0
Samsung is no longer a sponsor of Conservancy.
2016-08-27 13:16:54 -07:00
Bradley M. Kuhn
9884c81441
Double // broke this URL.
2016-08-09 10:51:11 -07:00
Bradley M. Kuhn
9f4f3ffcc4
Add menu links.
2016-08-09 06:00:19 -07:00
Martin Michlmayr
886e3e7e55
Remove deprecated media type projection
2016-06-08 13:40:43 -07:00
Martin Michlmayr
e60a36fe43
Fix HTML syntax error - close elements in right order
...
The <a> has to be closed before the <div>.
2016-05-07 20:12:35 -07:00
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
4cd5f38ffa
fixing typo
2016-04-26 14:18:13 -04:00
9dc28858c8
adding timeline for donations to save enforcement
2016-04-26 14:16:33 -04:00
3c8d9abb43
Fix sizing of HPE logo
2016-03-30 22:21:38 -04:00
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 & 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
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
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
Bradley M. Kuhn
2bcb073151
Note lexicographical, not alphabetical
2015-01-04 12:34:28 -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
3256391c99
Remove male dominated placeholder.
2014-12-03 13:49:06 -05:00
Bradley M. Kuhn
f1c46c481d
Move support higher up.
2014-12-03 13:48:09 -05:00
Bradley M. Kuhn
33025998fb
Shorten title, reword information.
2014-12-03 13:47:50 -05:00
Bradley M. Kuhn
50cf881501
Add supporter program to front page.
2014-12-03 13:46:44 -05:00
Bradley M. Kuhn
27276109ad
Add copyleft.org and NPO Acct to "Learn more" link
2014-12-03 13:46:29 -05:00
Bradley M. Kuhn
b5a7c9ecda
Make supporter page live on the menu.
2014-12-01 13:56:44 -05:00
Bradley M. Kuhn
8e728d010c
Campaign is no longer "campaign", but npoacct.
...
Changes in preparation of launching supporter program; no longer
highlight this as the "campaign".
2014-12-01 13:01:06 -05:00
Martin Michlmayr
1909b80564
Convert img border to CSS via style
2014-11-11 18:00:02 -05:00
Martin Michlmayr
fffb27d71d
Use HTML5
2014-11-01 11:33:25 +01:00
Martin Michlmayr
ca961add01
Reduce whitespace/linebreaks in HTML output
2014-07-16 13:35:35 -04:00
Martin Michlmayr
6c75aa824d
Use same logic for blogs as for news
...
Put the code for blog.1 within the if block of blog.0, as this is the
logic used for news. As a result, the <hr> divider for blogs is now
in the "shaded" element (as it already is with news).
2014-07-15 18:30:25 -04:00
Martin Michlmayr
4802759d06
Put "Conservancy Blog" heading in shaded element for consistency with news
2014-07-15 18:27:24 -04:00
Martin Michlmayr
350bdfa106
Move the hr into the shaded div
...
Move the hr into the shaded div, as is already the case with news.
2014-05-02 12:27:13 -04:00
Martin Michlmayr
cb8f62370d
Fix HTML </div> error on frontpage
...
One too many <div> elements were closed when no blogs were displayed.
Note that the logic between news and blogs is different: news opens
one "shaded" div and puts all news in it. In the case of blogs, one
"shaded" div is created for each blog entry displayed.
2014-05-01 19:27:04 -04:00
Martin Michlmayr
c0bf257532
Close mainContent <div> element
2014-04-17 19:07:13 -04:00
Martin Michlmayr
cc031b3b61
Fix syntax for HTML comment
2014-04-17 19:01:51 -04:00