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

2066 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bradley M. Kuhn
835d482604 No longer "stash" the GET object in self. 
I don't think this was actually necessary ultimately.  I think the older
code, herein removed, in item_author_email() was wrong-headed in the
first place, or at the very least, was overkill.

Each item has a distinct author, according to the BlogEntry model.  So,
I think this is actually what we want.  I noticed the author filed isn't
properly going into the RSS at the moment anyway, but I'm somewhat past
caring about that, as long as the URLs now work to get author- and tag-
specific feeds.
 2014-07-14 14:39:10 -04:00
Bradley M. Kuhn
387275c9d4 GET object is accessible everywhere in BlogFeed. 
This solution is likely a hack to ensure the GET object is regularly
accessible.
 2014-07-14 13:10:23 -04:00
Bradley M. Kuhn
e75642ed47 use get_object() in BlogFeed to get request object 
Upon reading
https://docs.djangoproject.com/en/dev/ref/contrib/syndication/#a-complex-example

I think that this is what I need to do to forward-port this Django 1.2
to Django 1.4's Feed objects.
 2014-07-14 12:35:08 -04:00
Bradley M. Kuhn
2a572dcffa Fix regression introduced in commit early today. 
6a2918c288 introduced a removal of this
line.  This line is necessary for the front page to work.
 2014-07-14 12:08:53 -04:00
Bradley M. Kuhn
252f29af81 Make sure return values match title. 
I received this error from the feeds:

AttributeError at /feeds/news/

'PressRelease' object has no attribute 'title'

Request Method: 	GET
Request URL: 	http://sfconservancy.org/feeds/news/
Django Version: 	1.4.5
Exception Type: 	AttributeError

'PressRelease' object has no attribute 'title'
Exception Location: 	/var/www/conservancy/feeds.py in item_title, line 46

I think this change fixes that.
 2014-07-14 11:56:30 -04:00
Bradley M. Kuhn
527ad3087f Additional argument was likely incorrect. 
Rereading https://docs.djangoproject.com/en/1.4/ref/contrib/syndication/
shows that the first argument should no longer be that class.
 2014-07-14 11:49:03 -04:00
Bradley M. Kuhn
61476fdb5c First attempt to follow Django 1.4 feed classes. 
I followed the instructions at
https://docs.djangoproject.com/en/1.4/ref/contrib/syndication/
and attempted to get these feeds to match that one.
 2014-07-14 11:03:54 -04:00
Bradley M. Kuhn
10b785b04d Need to import these classes for urls to use them. 2014-07-14 10:55:58 -04:00
Bradley M. Kuhn
2c63f6b33e Try putting these settings in each class. 
I am not sure what the loop was for anyway.
 2014-07-14 10:54:25 -04:00
Bradley M. Kuhn
18addfe969 Additional issues deal with feed_dict deprecation. 2014-07-14 10:52:41 -04:00
Bradley M. Kuhn
6a2918c288 In Django 1.2, feed_dict was deprecated. 
Therefore, change this to use the method explained at:

https://docs.djangoproject.com/en/dev/releases/1.2/#feed-in-django-contrib-syndication-feeds
 2014-07-14 10:49:29 -04:00
Bradley M. Kuhn
f18e922cf8 Merge branch 'master' of gitorious.org:conservancy/website 2014-07-14 10:22:44 -04:00
Bradley M. Kuhn
7835493122 Apparently, "Feed" is now capitalized. 
http://stackoverflow.com/questions/6642829/how-to-resolve-could-not-import-django-contrib-syndication-views-feed-error-in
 2014-07-14 10:20:15 -04:00
Martin Michlmayr
6dcb45d412 Update number of member projects 2014-07-09 16:43:01 -04:00
Bradley M. Kuhn
d70e6f3f8b Update for Djnango 1.4.5: admin.site.urls 
http://stackoverflow.com/questions/5503616/how-to-correct-this-error-adminsite-object-has-no-attribute-root
 2014-07-08 13:33:06 -04:00
Bradley M. Kuhn
85e9253eec Update for Djnango 1.4.5: feeds import. 2014-07-08 13:25:48 -04:00
Bradley M. Kuhn
639860b6e0 Fix alphabetical order problem from last commit. 2014-07-04 10:29:44 -04:00
Bradley M. Kuhn
b1a18a5aec Kallithea is Conservancy's newest member project. 
See http://sfconservancy.org/news/2014/jul/04/kallithea-joins/ for the
full announcement.
 2014-07-04 10:26:01 -04:00
Bradley M. Kuhn
0f00a679a4 Update progress & note it's only updated monthly. 
I've not been on top of updating this, but I'll usually do it at least
monthly now.
 2014-07-04 10:25:21 -04:00
Bradley M. Kuhn
865a56a6d6 Better spacing between donation types. 2014-06-13 08:15:05 -04:00
Bradley M. Kuhn
77f6c9ffa3 Better instructions and detail about wire transfer donations. 2014-06-13 08:13:33 -04:00
Tony Sebro
ee30bcb2bf updated outside counsel list to include Pam Chestek. 2014-05-29 18:15:29 -04:00
Bradley M. Kuhn
8dd4396a59 Karen is an employee now. 2014-05-05 13:27:25 -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
Bradley M. Kuhn
de0b3fbb09 Include donations in progress bar through 2014-04-20. 
mjw insisted that I update this more often; he's right about that. :)
 2014-04-30 11:15:06 -07:00
Bradley M. Kuhn
24a8201313 Updates to the FSA template from Conservancy's internal repository. 
Included is now the ODT version of the template, that Tony and Karen insisted
on. :)
 2014-04-24 11:29:13 -04:00
Bradley M. Kuhn
f8814509e2 Ignore the subdirectory logs. 2014-04-23 13:20:56 -04:00
Bradley M. Kuhn
9e7875d5d7 Update Karen's Bio on Eval Committee page as well. 2014-04-23 13:20:41 -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
5456654ed2 Fix number of current projects 2014-04-17 13:07:29 -04:00
Martin Michlmayr
80392225ca Use HTML element for ampersand 2014-04-17 13:04:05 -04:00
Martin Michlmayr
e4a92f8bab Use American English for consistency 2014-04-17 12:54:13 -04:00
Martin Michlmayr
d7ace48349 Use Conservancy instead of SFC for consistency 2014-04-17 12:54:08 -04:00
Martin Michlmayr
ce2eeafb29 Fix HTML error - opening element used to close paragraph 2014-04-17 12:53:47 -04:00
Martin Michlmayr
e37dc9ceae Fix use of <p> in relation to <ul> 2014-04-17 12:53:35 -04:00
Martin Michlmayr
6e8d7dd68a Add missing </a> 2014-04-17 12:53:29 -04:00
Martin Michlmayr
5b627813e4 Fix error ID "sponsor" already defined 
An id can only be used once, you'd have to use a "class", but since the
<ul> element has an id the individual list elements will get the right
CSS values.
 2014-04-17 12:53:21 -04:00
Martin Michlmayr
46e66f42af Remove empty list element 2014-04-17 12:53:00 -04:00
Bradley M. Kuhn
f2e173d19e Update my bio. 2014-04-02 08:12:30 -04:00
Bradley M. Kuhn
14ae2f83ae Update to Karen's bio, as she emailed to me last night. 2014-04-02 08:01:32 -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
f9eaefc173 Updated my bio. 2014-03-31 10:22:09 -04:00
Bradley M. Kuhn
00355badf7 Correct my title. 2014-03-31 10:16:01 -04:00