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

479 commits

Author SHA1 Message Date
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
Martin Michlmayr
d7ace48349 Use Conservancy instead of SFC for consistency 2014-04-17 12:54:08 -04:00
Bradley M. Kuhn
40c267daa1 Revert that last one, that's not the right way to do this. 2014-03-31 18:46:16 -04:00
Bradley M. Kuhn
c2a1250eac Put the time in 24 hour notion. 2014-03-31 18:44:05 -04:00
Bradley M. Kuhn
09d7a3aa2c Remove <br>'s, extra line, and fix variable name. 2014-03-31 18:41:43 -04:00
Bradley M. Kuhn
f3548d51a0 Rework how blog authors appear. 2014-03-31 18:39:35 -04:00
Bradley M. Kuhn
d66597edeb Fix div's, I think. 2014-03-31 18:36:21 -04:00
Bradley M. Kuhn
d24d3763b3 Improve template for blog when two appear. 2014-03-31 18:34:01 -04:00
Bradley M. Kuhn
3ef1208e71 Campaign doesn't need to be a template or an application. 2013-04-30 21:14:58 -04:00
Bradley M. Kuhn
4c86f87afb Corrected name of accounting campaign logo image, and add image itself. 2013-04-30 21:11:13 -04:00
Bradley M. Kuhn
bda85a597b Styles should live in CSS, not in the template. 
Properly use nav-bg for campaign.
 2013-04-30 20:01:48 -04:00
Denver Gingerich
2309ff0948 add accounting campaign page; update styles/navbar 2013-04-30 00:13:45 -04:00
Bradley M. Kuhn
1032f1d75f sfconservancy.org now has an SSL certificate; make site HTTPS-Everywhere compatible. 
Change all links when possible to not mention a site, so HTTPS will be used
automatically for same-site links.

For embedded images, and other links out to the rest of the world, use HTTPS
when the site is known to support it.
 2013-04-26 12:48:19 -04:00
Bradley M. Kuhn
f5f1efa6e1 Say "et alia" here instead of Contractors, since we have no Contractors listed, 
but *do* have Directors Emeriti listed.
 2013-04-23 13:24:36 -04:00
Bradley M. Kuhn
63f708f928 Will a shorter string make this work? Unsure why it isn't working now, actually. 2013-04-23 13:20:35 -04:00
Bradley M. Kuhn
3202d679c5 Properly set class for CCS so the EvalCommittee menu item formats properly. 2013-04-23 13:16:15 -04:00
Martin Michlmayr
797c361236 Add page for Evaluation Committee 2013-04-23 13:09:57 -04:00
Bradley M. Kuhn
f1575ece1a Merge in various HTML fixes from Martin Michlmayr <tbm@cyrius.com> on 2013-02-21. 
This did not fast-forward merge because I'd made changes to those files since
Martin submitted his merge request.  This merge brings in the changes
contributed in the following two commits from Martin:

commit 8b54927bb5
Author: Martin Michlmayr <tbm@cyrius.com>
Date:   2013-02-21 21:47:15 +0000

    Remove stray character

commit 660c48a528
Author: Martin Michlmayr <tbm@cyrius.com>
Date:   2013-02-21 21:46:40 +0000

    Fix various HTML syntax errors
 2013-03-01 12:03:43 -05:00
Bradley M. Kuhn
ba5484a335 Switch to CC-By-SA-USA-3.0 instead of Unported. 2013-02-28 16:02:28 -05:00
Martin Michlmayr
660c48a528 Fix various HTML syntax errors 2013-02-21 21:59:26 +00:00
Bradley M. Kuhn
a18e221dc6 Move email subscribe box to the front page only. 
It just looked wrong up there on top of the page.  I know that's what I
suggested to Paul to do it, but 11 months later, when I finally accepted his
merge request, it just didn't make sense.
 2013-02-21 13:42:10 -05:00
Paul Visscher
a4255c7e51 Add subscription form to the top right of the site (possibly all pages). 
I was only able to get the site running on my local machine well enough to test the main page. It's possible, based on the filename, that the changes will appear on all Conservancy pages. I'm not sure if that is what is wanted or not. If not, it seems like some more invasive changes would need to be made to the base template so that the form would only appear on the index page.

The form POSTs to a mailman url. Once submitted, the user is redirected to the mailman site with no obvious way (aside from the back button) to return to the main site. This can be fixed by using AJAX to POST the form and report the subscription status back to the user, but it would likely require parsing the mailman html as there doesn't appear to be any real API to mailman.

I tested this in Firefox 11.0 and Chrome 18.0.1025.113 beta.
 2013-02-21 13:34:54 -05:00
Tony Sebro
2fdb22fc9a spotted a few more errant "The"s; deleted them. 2013-02-21 13:19:01 -05:00
Bradley M. Kuhn
39cef27975 Add flattr link. to all pages. 2012-10-05 15:29:09 -04:00
Bradley M. Kuhn
31f8c8a203 Too many words. 2012-08-27 10:21:14 -04:00
Bradley M. Kuhn
b9c09aa174 Created initial sponsors page. 2012-08-27 10:19:13 -04:00
Bradley M. Kuhn
d718f82272 Keep news items a bit longer than previously. 2012-03-08 10:58:09 -05:00
Bradley M. Kuhn
9eb6dece5c Fixed CSS to highlight on about page properly. 2011-09-30 09:26:17 -04:00
Bradley M. Kuhn
a2816aa502 Added Tony Sebro to staff, add outside counsel and contractors. 2011-09-30 09:22:14 -04:00
Bradley M. Kuhn
0df7cde890 Added Twitter and Identica follow links. 2011-02-15 10:35:21 -05:00
Bradley M. Kuhn
b1419ca6bb Fixed typo in URL on front page. 2011-01-13 15:40:18 -05:00
Bradley M. Kuhn
69b64e2b05 Corrected grammar error as reported by tedks: http://identi.ca/notice/61449503 2011-01-03 06:54:36 -05:00
Bradley M. Kuhn
b7d9a02553 Mention documentation as well as development! 2010-11-10 10:11:05 -05:00
Bradley M. Kuhn
c88641d47c Put up to three news items on Conservancy front page. 2010-10-11 16:13:50 -04:00
Bradley M. Kuhn
ff42a3b85d News category setting comes from template we inherit from. 2010-10-11 16:09:46 -04:00
Bradley M. Kuhn
654453c1c2 Allow for two news items at once on the frontpage. 2010-10-11 15:53:18 -04:00
Bradley M. Kuhn
fb658152cf Fixed email address in the template. 2010-10-05 10:55:43 -04:00
Bradley M. Kuhn
f24a2fc033 Added omnibus feed templates. Without these, the feed seemed to work, but 
the description text was not appearing.
 2010-10-05 10:52:05 -04:00
Bradley M. Kuhn
c2b771086c Proper placement of tag close. 2010-10-04 12:29:26 -04:00
Bradley M. Kuhn
b0fd4e13db s/.../&hellip;/ 2010-10-04 12:25:53 -04:00
Bradley M. Kuhn
4fac84c550 Change email address. 2010-10-04 12:24:45 -04:00
Bradley M. Kuhn
64feb78cf7 removed extraneous space. 2010-10-04 12:17:16 -04:00
Bradley M. Kuhn
28e3f83841 Got Blog working; Fixed feeds added content to front page; switch blog template style. 2010-10-04 12:15:53 -04:00
Bradley M. Kuhn
9ec1bbe85a Corrected front page code and template so that blog posts appear. 2010-10-04 11:27:04 -04:00
Bradley M. Kuhn
c144b0c54e Added blog to URL list and to front page. Fixed columns on front page. 2010-10-04 10:54:09 -04:00
Bradley M. Kuhn
79140d46a5 Added blog templates. 2010-10-04 09:52:04 -04:00
Bradley M. Kuhn
a6f8800a3f Improved year look. 2010-10-04 09:47:51 -04:00
Bradley M. Kuhn
9065e188a0 Fixed link to staff page. 2010-10-03 22:54:14 -04:00
Bradley M. Kuhn
3ea00297ec Created source links. 2010-10-03 22:28:24 -04:00
Bradley M. Kuhn
88ef25012f Moved some overview text over to frontpage; fixed typo in overview; 
s/.../&hellip;/
 2010-10-03 21:50:16 -04:00
Bradley M. Kuhn
5b48141070 Various formatting and typo fixes. 2010-10-03 21:44:32 -04:00
Bradley M. Kuhn
71f773159e s/conservancy.softwarefreedom.org/sfconservancy.org/g 2010-10-03 20:28:09 -04:00
Bradley M. Kuhn
8179150188 Beginning work on members submenu group on the site: 
* wrote services page.
  * created template.
  * added submenu to CSS.
 2010-10-03 20:25:30 -04:00
Bradley M. Kuhn
d2af6a0cb5 Rework of about section, including many content changes and a few 
formatting ones.
 2010-10-03 19:07:48 -04:00
Bradley M. Kuhn
f426e60136 Mostly got a sidebar on the left working, for submenu. 
Modifications to the templates to take advantage of new submenu.
Some content changes with "about" section, where I was implementing the changes.
 2010-10-03 18:37:08 -04:00
Bradley M. Kuhn
d53922ed5c Removed blank line. 2010-10-03 13:45:48 -04:00
Bradley M. Kuhn
e256b5329c Next version of Fab's text-containing image logo; some CSS and HTML 
changes to make the appearance of it better.
 2010-10-03 13:29:23 -04:00
Bradley M. Kuhn
0fc09ea154 Color improvement from fab; still trying to work out text placement. 2010-10-03 12:13:12 -04:00
Bradley M. Kuhn
53acfaa42f First attempt and putting logo up on the site. 2010-10-03 12:04:17 -04:00
Bradley M. Kuhn
3324cfe1fe Added logobutton class. 2010-10-03 11:24:28 -04:00
Bradley M. Kuhn
7cdb205f4b Fixed domain name. 2010-09-26 20:27:31 -04:00
Bradley M. Kuhn
12780197e5 Adapted Django application stuff for Conservancy; and normalized to string 
"conservancy" within code and templates.
 2010-09-26 17:56:29 -04:00
Bradley M. Kuhn
c858e825c0 Conservancy website as it currently looks; unfortunately, old history before this cannot easily be retrieved 2010-09-26 17:20:05 -04:00