Commit graph

346 commits

Author SHA1 Message Date
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