Commit graph

1417 commits

Author SHA1 Message Date
Tony Sebro
01fa72ba1e remove spurious word "source".
bkuhn committing on behalf of Tony:

<tony> bkuhn: if you're making edits, please change "free and open
       source society" to "free and open society".  My Kallithea set up
       is still giving me problems (even after I uploaded my SSH key).
       I'll connect w/ Brett to fix next week.
2016-11-22 09:59:39 -08:00
b37026be4d Rewrite of paragraph pasted into XMPP.
bkuhn committed this on behalf of Karen.  She pasted this into an XMPP
chat before boarding a plane.
2016-11-22 09:58:41 -08:00
Brett Smith
c7fb837aba appeal: Add missing Oxford comma. 2016-11-22 09:52:27 -08:00
Brett Smith
52ed68053d appeal: Minor layout cleanups.
Forward port of e303e2776d from Brett.
2016-11-22 09:51:03 -08:00
Bradley M. Kuhn
232310f75d A few additional changes, apparently from Brett.
Step 4 in backport of unversioned changes from Brett done in
01ab5892ba.
2016-11-22 09:45:30 -08:00
Bradley M. Kuhn
368fc07f6f Switch link to be all blog posts on ContractPatch
Step 3 in backport of unversioned changes from Brett done in
01ab5892ba.
2016-11-22 09:39:33 -08:00
Bradley M. Kuhn
99059c2b6f Various editorial changes, apparently from Brett.
Step 2 in backport of unversioned changes from Brett done in
01ab5892ba.
2016-11-22 09:38:36 -08:00
Bradley M. Kuhn
20f778565b Switch to unicode alt's for imgs
Step 1 in backport of unversioned changes from Brett done in
01ab5892ba.
2016-11-22 09:27:36 -08:00
Bradley M. Kuhn
1d83205723 Two small formatting changes.
Step 0 in backport of unversioned changes from Brett done in
01ab5892ba.
2016-11-22 09:24:53 -08:00
Bradley M. Kuhn
4b2ac8402b Remove https?://sfconservancy.org/ for this site.
This is for deployment on sfconservancy.org, and as such, nothing should
begin with http://sfconservancy.org/ https://sfconservancy.org/.

Brett did this change before committing the initial version of the 2016
appeal.
2016-11-22 08:56:17 -08:00
Bradley M. Kuhn
6802f6a78e Revert back 2016 appeal to Karen's version.
Something was wrong with the version Brett committed.  It seemed to
merge text from Karen's 2016 version and the original 2015 version in
odd ways, particularly at the beginning.  This commit reverts back to
the version as Karen wanted it last night.  I will next forward-port
patches from Brett and those Karen gave this morning.
2016-11-22 08:54:02 -08:00
Brett Smith
210745ab10 appeal: Add missing Oxford comma. 2016-11-22 09:00:43 -05:00
Brett Smith
e303e2776d appeal: Minor layout cleanups. 2016-11-22 08:53:52 -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
6f06967a30 frontpage: Reduce the two-column width split to 67em.
This brings the columns from a target width of about 60 characters to
about 52.
2016-11-22 08:20:04 -05:00
Brett Smith
b12b2bb59a copyleft: Add Chinese translation of Principles. 2016-11-21 15:56:02 -05:00
Brett Smith
7e8d0538aa site: Font size adjustments throughout. 2016-11-17 11:35:22 -05:00
Brett Smith
4663e609ec site: Use default font size globally. 2016-11-17 11:04:09 -05:00
Brett Smith
d2657eddd0 frontpage: Adjust column presentation. 2016-11-17 10:56:58 -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
Bradley M. Kuhn
78e99181af Anchor for Compliance Program for Linux Developers
I think I'd already linked to this elsewhere even and forgot to add it.
2016-11-16 09:05:13 -08: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
875a3650f3 Minor changes to formatting and header text.
The email address to contact about the GPL Compliance Program for Linux
Developers was incorrect, that's fixed to
<linux-services@sfconservancy.org> instead of
<compliance@sfconservancy.org>.

Add "Template Only" as a background image to the actual text to
discourage people from signing this unilaterally.
2016-11-03 18:21:01 -07:00
Bradley M. Kuhn
8777ac2383 Add links to template agreements.
But encourage people not to sign them.
2016-11-03 18:06:09 -07:00
Bradley M. Kuhn
7495b1f4f8 Add QEMU to this list. 2016-11-03 18:03:01 -07:00
Bradley M. Kuhn
5754f877c5 Add paragraph about principles-discuss.
Welcome those who visit this page to join the principles-discuss mailing
list.  In doing so, also make a link to the principles themselves.
2016-11-03 18:02:30 -07:00
Bradley M. Kuhn
03727955d9 Publish copies of the Linux enforcement agreements 2016-11-03 09:51:57 -07:00
Brett Smith
3705a2ba1d static: Re-fix path manipulation in index.
* Strip any leading / to treat it as a relative path.
* Append `index.html` before converting to bytes.
2016-11-03 10:58:23 -04:00
Brett Smith
93787dc820 static: Don't try to render non-template files as templates. 2016-11-03 10:34:01 -04:00
Brett Smith
6b1b3b8f2e static: Encode paths as UTF-8 before translating to the filesystem. 2016-11-03 10:34:01 -04:00
Brett Smith
39314c254e static: Use built-in methods for path manipulation. 2016-11-02 16:45:34 -04:00
Brett Smith
9e983208a0 img: Add images for Karen's OSCON EU news item. 2016-10-26 17:23:28 -04:00
Bradley M. Kuhn
2ecf537e33 Update my bio to the current version.
This is the current version that i use when submitting talks.
2016-10-24 14:07:08 -07:00
Bradley M. Kuhn
f40a1209a9 /projects now handled by static views.
As a last step, we remove /members, which is now fully handled by Apache
static config, to be /projects for use the static page handler.
2016-10-24 13:56:37 -07:00
Bradley M. Kuhn
75846d7f35 Merge my local changes with upstream changes. 2016-10-24 13:44:42 -07:00
Bradley M. Kuhn
dde4afdd11 Rename members directory -> projects directory.
As part of the transition to have the canonical URL for member projects
be "projects" instead of "members", rename the directories.

The following rewrite rule will be needed in Apache configuration now:
         RewriteRule    ^/?members?/index.html$ supporter/ [L, R]
         RewriteRule    ^/?members?/(.+)$ projects/$1 [L, R]
         RewriteRule    ^/?members?/?$ supporter/ [L, R]
2016-10-24 13:40:04 -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
be762220af Foresight project wound down a while back.
Foresight project isn't active anymore and informed us a while back that
they weren't.  We left them up for a time, but it was confusing
2016-09-30 10:23:28 -04:00
Brett Smith
2ed9964157 npoacct: Update quote from SPI. 2016-09-27 15:23:02 -04:00
Bradley M. Kuhn
a9ce40d5d0 Ladies T-shirt sizing requests for monthly/renewal 2016-09-22 17:21:04 -07:00
Bradley M. Kuhn
b4ea2c419e Fitted t-shirt change. 2016-09-22 08:12:51 -07:00
Bradley M. Kuhn
b853fb05a4 Loïc link direclty. 2016-09-22 08:12:45 -07:00
Brett Smith
ec26bfc846 supporter-page.js: Add my copyright. 2016-09-09 15:39:21 -04:00
Brett Smith
ab29d45639 Supporter page: Try #2 for scroll to type selection after window ready.
* Trigger on the "load" event rather than "ready".
* Install the handler outside document's "ready" handler so it should
  take effect more reliably.
2016-09-09 15:16:46 -04:00
Brett Smith
fa6a61ed9b Supporter page: Scroll to type selection after window ready. 2016-09-09 14:51:11 -04:00
Brett Smith
9d30d7431a Supporter page: Make supporter type selections act like tabs.
* Scroll to the type selection when the visitor follows a link to a
  specific type.
* Don't scroll the page when the user changes their selection.
2016-09-09 14:35:15 -04:00
Brett Smith
c2ee1c761d Supporter page: Remove debug log. 2016-09-09 12:11:29 -04:00
Brett Smith
86ef51db5d Supporter page: Refactor JavaScript.
This isn't intended to have any functional change, it's just DRYing up
the code to simplify functional changes later.
2016-09-09 12:10:41 -04:00
Brett Smith
e9f01f106a 2015-supporter-appeal: Fix typo. 2016-09-09 12:10:09 -04:00
Martin Michlmayr
2d57f2dd77 Move Stormy Peters to Director Emeritus
Stormy Peters resigned after 5 years on the board.  Thank you for
your contribution!
2016-09-02 20:00:43 -07:00
Bradley M. Kuhn
4256fb3962 Update Adam's title. 2016-09-01 16:44:44 -07:00
Bradley M. Kuhn
a5d2e900d4 Asheesh no longer Executive Director of OpenHatch 2016-09-01 16:41:15 -07:00
Bradley M. Kuhn
9d681f5b3a Simon is no longer president 2016-09-01 16:40:57 -07:00
Bradley M. Kuhn
adfbd2ffc4 Remove Quoting Karen quote
Quoting Karen from the time when she was Executive Director of GNOME
Foundation probably isn't helpful now that she's our Executive Director.
2016-09-01 16:38:47 -07:00
Bradley M. Kuhn
3ebf6a740b Even more removal of deprecated stuff.
The base template has most of this now.
2016-09-01 16:37:18 -07:00
Bradley M. Kuhn
18a9b4ec21 Remove links to depreciated Javascript and CSS. 2016-09-01 16:36:17 -07:00
Bradley M. Kuhn
bfc34eff70 Remove counter box no longer used.
We never hit the fundraising target, and did the best we could in
spending the funds, so there is no need to keep this progress bar.

Encourage people to donate to Support program.
2016-09-01 16:34:44 -07:00
Brett Smith
ba80acf187 npoacct: Add news about Reimbursement system. 2016-08-31 16:47:45 -04:00
Brett Smith
63405c1dee npoacct: Remove fundraising references from page body. 2016-08-31 16:27:39 -04:00
Bradley M. Kuhn
35f2952db5 Add tech id in this tag. 2016-08-29 22:22:59 -07:00
Bradley M. Kuhn
9682d113c0 Samsung is no longer a sponsor of Conservancy. 2016-08-27 13:16:54 -07:00
Bradley M. Kuhn
6a3467eef3 Add Brett's bio. 2016-08-22 08:55:44 -07:00
Bradley M. Kuhn
4521dfa06a Add Google check details. 2016-08-19 07:45:51 -07:00
Bradley M. Kuhn
30fdeb75aa Merge branch 'master' of ssh://k.sfconservancy.org/website 2016-08-09 15:47:32 -07:00
Bradley M. Kuhn
59f08ae812 Various fixes from regenerated from Markdown source 2016-08-09 15:16:44 -07:00
Martin Michlmayr
bd5738bdca Fix typo 2016-08-09 14:28:34 -07:00
Bradley M. Kuhn
c41c973f99 Clarify this sentence. 2016-08-09 11:38:50 -07:00
Bradley M. Kuhn
73f0b434ca Shorten title. 2016-08-09 11:35:28 -07:00
Bradley M. Kuhn
9884c81441 Double // broke this URL. 2016-08-09 10:51:11 -07:00
Bradley M. Kuhn
787f58c121 Fix incorrect word. 2016-08-09 10:25:51 -07:00
Bradley M. Kuhn
ce6d470b04 Properly close ancor. 2016-08-09 08:30:00 -07:00
Bradley M. Kuhn
799a1122af Update timeline in "appeal" document. 2016-08-09 06:12:42 -07:00
Bradley M. Kuhn
c87d37688f Update FAQ entries from material from appeal. 2016-08-09 06:12:34 -07:00
Bradley M. Kuhn
d77fc565f8 Add menu item to CSS 2016-08-09 06:01:19 -07:00
Bradley M. Kuhn
9f4f3ffcc4 Add menu links. 2016-08-09 06:00:19 -07:00
Bradley M. Kuhn
651ac80b41 Proper placement of this <hr> tag. 2016-08-09 05:53:52 -07:00
Bradley M. Kuhn
654a38c6d5 Move Supporter button to top of page. 2016-08-09 05:52:50 -07:00
Bradley M. Kuhn
9a142ebfd7 Add link to partial source release. 2016-08-08 22:05:59 -07:00
Bradley M. Kuhn
2d694dafc2 Remove unprocessed backreference to footnote 2016-08-08 22:03:18 -07:00
Bradley M. Kuhn
20d1d04191 Fix code command formatting. 2016-08-08 21:57:27 -07:00
Bradley M. Kuhn
3d4bf5159b Update with various changes. 2016-08-08 21:55:58 -07:00
Bradley M. Kuhn
49aad6b046 Add introduction text. 2016-08-08 21:38:02 -07:00
Bradley M. Kuhn
7128285bcc VMware code similarity analysis. 2016-08-08 21:34:31 -07:00
Bradley M. Kuhn
80883cf4e8 Give more information
... to quell silliness of people saying we don't take EUR.
2016-07-14 11:16:17 -07:00
Martin Michlmayr
886e3e7e55 Remove deprecated media type projection 2016-06-08 13:40:43 -07:00
Kevin Brosnan
413d162e74 Remove problematic four digit CSS code
Text is not dislpayed correctly with newer browsers, such as Firefox 49,
because of CSS color values. In current browsers the four digit values
are discarded as invalid CSS. Browsers are adding support for RGBA as a
valid CSS color value.

https://github.com/webcompat/web-bugs/issues/2628
2016-06-08 13:39:35 -07:00
Bradley M. Kuhn
0deeb50191 Update info about FY 2015. 2016-05-10 11:30:28 -07:00
Bradley M. Kuhn
0a8bb49e20 Amended FY 2012 Form 990 as filed on 2015-01-09.
There were a few typos in our FY 2012 Form 990.  Back on 2015-01-09, we
filed an amended Form 990.  I had forgotten until today (see commit
date) to update the website with it.  The author date of this commit
matches the date we filed.
2016-05-10 11:24:43 -07:00
Bradley M. Kuhn
31c6c9ed33 Form should be singular here.
This was likely a bad cut-and-paste from the years where we filed Form
990-T.
2016-05-10 11:12:50 -07:00
Martin Michlmayr
af6102f3c1 Fix link to Git web site
Fix link to Git web site.  I didn't notice that the https site
uses .com rather than .org.
2016-05-07 20:21:09 -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
Martin Michlmayr
99e2a53de2 Use secure http for project links where possible
Use secure http for project links where possible.  Thanks to Paul Wise.
2016-05-07 20:06:53 -07:00
Martin Michlmayr
42ddcaed7b Update links to member projects
Update links to member projects.  Thanks to Paul Wise for the updates.
2016-05-07 20:03:45 -07:00
Bradley M. Kuhn
c414214e50 Merge my offline changes with upstream pushes on k
ssh://k.sfconservancy.org/website had incoming changes for me.
2016-04-28 12:58:33 -07:00
Bradley M. Kuhn
fb9c5cffd2 Comment out event, but leave text in.
I want this here so it's ready in future.
2016-04-28 12:58:05 -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
Bradley M. Kuhn
781a524676 Add LFNW thank-you. 2016-04-22 09:11:48 -07:00
Bradley M. Kuhn
438a278298 Remove LinuxConf AU match. 2016-04-22 09:09:43 -07: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
b9a2a729fb adding HPE logo 2016-03-30 21:54:38 -04:00
1582b52740 Removing reference to Supporter event that was held already on March 19, 2016 2016-03-19 23:12:34 -04:00
c3fe10e318 Adding text about Supporter-only event in Cambridge, MA on March 19 for new Supporters. 2016-03-14 20:52:26 -04:00
73b6813f2d Fixing number of current member projects 2016-03-14 14:31:21 -04:00
f4c4ad3fb4 Adding Spec-Ops to Current Member Projects page 2016-03-08 21:21:10 -05:00
8c756393c0 Adding Homebrew to Current Member Projects page 2016-03-08 21:13:54 -05:00
Martin Michlmayr
a17e1d7c73 Updated name of Martin Michlmayr's employer 2016-03-03 14:57:37 -08:00
Bradley M. Kuhn
b850e3dc5a Rework text about reporting violations.
Include a link to my blog and how it's temporary.

Make section heading about donating.
2016-03-03 12:46:44 -08:00
Bradley M. Kuhn
5bcc11efe3 Add title for reporting violations. 2016-03-03 12:45:54 -08:00
Bradley M. Kuhn
b35093a2fd Add busybox complaint. 2016-03-03 12:41:26 -08:00
Bradley M. Kuhn
771b54759a We met the PIA and LCA matches. 2016-03-02 17:04:40 -08: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
f115eea74c Merge public master branch with my local changes. 2016-02-29 15:16:06 -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
810b4fd360 Add id for funding. 2016-02-29 13:31:47 -08:00
Martin Michlmayr
1389703dc4 Minor whitespace fix
Since there's a whitespace after the opening bracket, there should
be whitespace before the closing bracket.
2016-02-28 12:12:01 -08:00
Martin Michlmayr
d00623dbd1 Explain that link is Korean
It may not be clear what the link is, particularly if you don't have
Hangul fonts installed.  I first thought it was a broken backlink.
2016-02-28 12:10:07 -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
Bradley M. Kuhn
15ee2b6edd Update punctuation. 2016-02-23 19:46:59 -08:00
Bradley M. Kuhn
cd15ed755b moreCount variable no longer used. 2016-02-23 19:45:50 -08:00
Bradley M. Kuhn
e260280ee1 Fix math error. 2016-02-23 19:45:16 -08:00
Bradley M. Kuhn
99ff4771a1 Change bar to show totals in a different way.
The achieved! text is removed, to just show the total Supporters, and
the middle part is how many more we need right now.
2016-02-23 19:21:22 -08:00
Bradley M. Kuhn
093f131738 Rename file. 2016-02-23 14:27:06 -08:00
fc8a2ab27e adding pdf of testimony as delivered 2016-02-23 17:19:21 -05:00
d272ff9612 adding picture taken by David Moore, CC-BY-SA-4 2016-02-23 17:16:27 -05:00
Bradley M. Kuhn
a28825da29 Create a few id tags for linking directly to FAQs. 2016-02-21 14:23:29 -08:00
Bradley M. Kuhn
57b12bb58f Add missing inner <ul> 2016-02-19 21:00:49 -08:00
Bradley M. Kuhn
823061bfbe Merge changes made to master by others. 2016-02-19 20:59:26 -08:00
Bradley M. Kuhn
e278e509ca Add Auditor's report from FY 2014. 2016-02-19 20:58:16 -08:00
Bradley M. Kuhn
1079f138fe Add FY 2014 Form 990; note FY 2015 schedule. 2016-02-19 20:57:16 -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
3f05f9e5da Formatting fix. 2016-02-05 15:46:13 +11: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
e80af0e706 Add details about Belgium event.
Make paragraph after that flow from it.
2016-01-22 14:18:57 -08:00
Bradley M. Kuhn
e9ab6d6e98 Explain what the renewal is. 2016-01-21 15:49:27 -08:00
Bradley M. Kuhn
40182feb8a Note that monthly renewal is automatic. 2016-01-21 15:48:21 -08:00
Bradley M. Kuhn
d7b22940be Wordsmith that last commit a bit. 2016-01-21 13:18:34 -08:00
Bradley M. Kuhn
22b5528ae5 Note that annual supporters are not auto-renew.
We long ago decided not to auto-renew annual supporters.  However, three
different potential supporters mentioned they were unsure, so this note
is added to clarify.
2016-01-21 13:17:03 -08:00
Bradley M. Kuhn
88a3e3e33f Update text to note reaching 750 level. 2016-01-20 15:20:07 -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
d628fa8fb7 Revert previous incorrect change. 2016-01-18 20:25:17 -08:00
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