Commit graph

1383 commits

Author SHA1 Message Date
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
619bc033bc js: Render <video> inner HTML when no source is supported.
The HTML inside <video> is meant to be rendered by browsers that don't
support the tag at all.  You have to respond to the JavaScript error event
to deal with browsers that support video, but no available source.  See
<https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Using_HTML5_audio_and_video#Showing_fallback_content_when_no_source_could_be_decoded>.
2016-12-31 15:19:59 -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
359cc7a068 css: <dl>s clear each other.
This prevents <dl>s from stacking horizontally when their <dt>s are short.
2016-12-31 14:30:19 -05:00
Brett Smith
a04d85a1e8 css: Move rules intended for bigscreen to the dedicated stylesheet. 2016-12-31 14:23:03 -05:00
Brett Smith
55c0b3bb1c css: Remove unused rules.
The rationale given in the comments for these rules no longer applies: there
are no divs with class column or conservancy-blog on any pages.  Meanwhile,
they're causing unwanted styling: we started using the column class on the
front page for two-column layout, and the videos are appearing smaller than
desired there.  Just remove these.
2016-12-31 13:58:18 -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
331b14b45e css: Remove noop rule.
This wasn't doing anything because "line-height" was misspelled.
2016-12-30 23:12:09 -05:00
Brett Smith
4409ac089a css: Center horizontal rules in frontpage columns. 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
492de3eab3 js: Rewrite #renew links to the Supporter page.
#renewal is the correct hash to use.
2016-12-29 10:33:22 -05:00
Brett Smith
02eab9cd69 img: Add photo of Karen's OSCon EU keynote. 2016-12-29 10:05:58 -05:00
Brett Smith
57136a93bd img: Add QEMU logo. 2016-12-27 12:50:13 -05:00
Brett Smith
8739534e9f copyleft-compliance: The principles link to principles-discuss. 2016-12-21 11:16:28 -05:00
Brett Smith
1b38fc338e css: Add max-width to bigscreen .picture. 2016-12-19 12:25:27 -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
Brett Smith
24b6e0a4d4 board: Add Kate Chapman bio. 2016-12-17 13:42:55 -05:00
Brett Smith
343d7e20d6 img: Add Godot logo. 2016-12-17 11:29:12 -05:00
Brett Smith
12dbdef2b9 img: Add Bdale headshots. 2016-12-17 11:29:01 -05:00
Bradley M. Kuhn
db4b90714b Add comment about logo sizes. 2016-12-09 13:17:57 -08:00
Brett Smith
9c9f745677 static: Add stickered laptop image. 2016-12-07 10:29:25 -05:00
Brett Smith
cf5b073d44 urls: Route /error/NNN/ to static.views.handler.
Since our Apache configuration uses `ErrorDocument NNN /error/NNN/`,
this is necessary to return the correct status code in those cases.
2016-12-05 21:43:51 -05:00
Brett Smith
58e22337b0 static: Errors return proper HTTP response code. 2016-12-05 21:15:01 -05:00
Brett Smith
3fe5f09d18 static: Remove hardcoded path. 2016-12-05 21:14:45 -05:00
Brett Smith
ce1b4b2528 Remove noop conservancy.context_processors imports.
You'll note this source doesn't exist in Git.
There's a reason for that.
2016-12-02 22:21:40 -05:00
Brett Smith
993f4bc72f settings: Don't FORCE_CANONICAL_HOSTNAME when DEBUG. 2016-12-02 22:17:59 -05:00
Brett Smith
6f540a0e3f Remove hardcoded references to /var/www.
This makes it easier to run the code elsewhere, like a development
environment.
2016-12-02 22:17:42 -05:00
Brett Smith
9822895971 supporter: Fix JS syntax to check donation upgrade amount. 2016-12-02 15:26:36 -05:00
Brett Smith
501b4b05fc supporter: Fix format string syntax error. 2016-12-02 15:15:49 -05:00
Brett Smith
4fa0f8343c supporter: Use proper float formatting for parameter validation. 2016-12-02 15:07:35 -05:00
Brett Smith
552bc6b1ca supporter: Route URLs to new submodule. 2016-12-02 12:52:32 -05: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
d28ffd68ca supporter: HTML5 improvements to form.
* Use "number" type for a better prompt.
* Use new standard "min" attribute for richer validation.
2016-12-02 12:35:19 -05:00
Brett Smith
4afce1eadc appeal: Fix object structure passed into $().multiprogressbar. 2016-12-02 10:13:25 -05:00
Brett Smith
2c5a5f3a95 appeal: Fix jQuery chaining that didn't work. 2016-12-02 10:11:21 -05:00
Brett Smith
6908c135f2 appeal: Progress bar emphasizes current match program. 2016-12-02 10:09:12 -05:00
Brett Smith
dd8d159fcb css: Add styles for blog pictures. 2016-12-01 15:04:55 -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
8b1a03ede2 supporter: Add Chinese translation of Principles as accomplishment. 2016-11-29 13:53:23 -05:00
Brett Smith
26674d8c5a supporter: Link to main ContractPatch site. 2016-11-29 13:53:08 -05:00
Brett Smith
1637a36dfe js: Fix math again.
I misunderstood how multiprogressbar works.  Values aren't expected to
progressively grow larger; it takes care of the summing itself.
2016-11-29 13:45:44 -05:00
Brett Smith
52bcf1152a js: Set default noCommaSiteMiddleGoal. 2016-11-29 13:29:12 -05:00
Brett Smith
05290a6352 js: Fix needProgress math. 2016-11-29 13:25:53 -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
8cb1f3f685 js: Use three-part progressbar when no middle goal defined.
Since our current fundraiser doesn't have a "middle goal," this makes
it a little easier to maintain the template and do the math.
2016-11-29 13:13:40 -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
d359dc690a copyleft: English Principles link to Chinese translation. 2016-11-28 12:14:44 -05:00
Bradley M. Kuhn
a2e1eda555 Various wordsmith and formatting changes.
You should feel free to revert these if you feel them incorrect.
2016-11-22 10:25:30 -08:00
Bradley M. Kuhn
1ae1aeca02 Add additional space.
I'm quite sure reimbursementrequests, despite how often we do them,
cannot be turned into one word just yet -- at least in English anyway.
2016-11-22 10:00:34 -08:00
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