From f7e45da6ddc85da5a21ccaffcd151f63412a7656 2010-09-26 21:54:29
From: Bradley M. Kuhn <bkuhn@ebb.org>
Date: 2010-09-26 21:54:29
Subject: [PATCH] Adapted Django application stuff for Conservancy; and normalized to string
"conservancy" within code and templates.

---

diff --git a/www/conservancy/apps/blog/models.py b/www/conservancy/apps/blog/models.py
index 753bedb221674bd9a7e233f859c36d6c1e801539..0db295ccfaf564e79d88d62584020e678e65272d 100644
--- a/www/conservancy/apps/blog/models.py
+++ b/www/conservancy/apps/blog/models.py
@@ -1,6 +1,6 @@
 from django.db import models
 from django.conf import settings
-from sflc.apps.staff.models import Person
+from conservancy.apps.staff.models import Person
 from datetime import datetime, timedelta
 
 class EntryTag(models.Model):
@@ -53,7 +53,7 @@ class Entry(models.Model):
     # Ping google blogs and technorati.  Taken from
     # http://blog.foozia.com/blog/2007/apr/21/ping-technorati-your-django-blog-using-xml-rpc/
     def save(self):
-        if settings.SFLC_DEVEL or True: # "or True" means it is disabled always
+        if settings.CONSERVANCY_DEVEL or True: # "or True" means it is disabled always
             super(Entry, self).save()
             return
 
diff --git a/www/conservancy/apps/blog/urls.py b/www/conservancy/apps/blog/urls.py
index 0125e0ce7f103eca60bccfaa68fe6274eaaf679b..083f3c85c142ba9aa1330a3e7b9147603930e065 100644
--- a/www/conservancy/apps/blog/urls.py
+++ b/www/conservancy/apps/blog/urls.py
@@ -1,7 +1,7 @@
 from django.conf.urls.defaults import *
 from models import Entry, EntryTag # relative import
 from views import last_name # relative import
-from sflc.apps.staff.models import Person
+from conservancy.apps.staff.models import Person
 from datetime import datetime
 
 extra_context = {}
@@ -20,7 +20,7 @@ urlpatterns = patterns('django.views.generic.date_based',
                                                 make_object_list=True)),
 )
 
-urlpatterns += patterns('sflc.apps.blog.views',
+urlpatterns += patterns('conservancy.apps.blog.views',
    (r'^/?$', 'custom_index', dict(info_dict, paginate_by=10)),
    (r'^query/$', 'query'),
 )
diff --git a/www/conservancy/apps/blog/views.py b/www/conservancy/apps/blog/views.py
index d76b48235021a633d170622ef591822fa107de17..5760ba21692235d665cd41a531c5890fef5634a6 100644
--- a/www/conservancy/apps/blog/views.py
+++ b/www/conservancy/apps/blog/views.py
@@ -1,6 +1,6 @@
 from models import Entry, EntryTag # relative import
 from django.views.generic.list_detail import object_list
-from sflc.apps.staff.models import Person
+from conservancy.apps.staff.models import Person
 from django.shortcuts import get_object_or_404, render_to_response
 from datetime import datetime
 
diff --git a/www/conservancy/apps/contacts/admin.py b/www/conservancy/apps/contacts/admin.py
index 92ce177d6b8e20433f963d5159f7e2183d8def68..2f8ad313acebb55132e5e3ccb8371d450da5a7ae 100644
--- a/www/conservancy/apps/contacts/admin.py
+++ b/www/conservancy/apps/contacts/admin.py
@@ -2,7 +2,7 @@ from django.contrib import admin
 from models import ContactEntry
 
 class ContactEntryAdmin(admin.ModelAdmin):
-    list_display = ('email', 'subscribe_sflc', 'subscribe_sfc')
+    list_display = ('email', 'subscribe_conservancy')
 
 
 admin.site.register(ContactEntry, ContactEntryAdmin)
diff --git a/www/conservancy/apps/contacts/models.py b/www/conservancy/apps/contacts/models.py
index bce1178c204d356af3fa8b23208ef274281cae3e..bc02a865855d97346661473a5ba33540c306fee7 100644
--- a/www/conservancy/apps/contacts/models.py
+++ b/www/conservancy/apps/contacts/models.py
@@ -1,13 +1,12 @@
 from django.db import models
 
 class ContactEntry(models.Model):
-    """SFLC contact system
+    """Conservancy contact system
 
     Hopefully this will be deprecated soon"""
 
     email = models.EmailField() # should make it unique, but we really cannot
-    subscribe_sflc = models.BooleanField()
-    subscribe_sfc = models.BooleanField()
+    subscribe_conservancy = models.BooleanField()
 
     class Meta:
         ordering = ('email',)
diff --git a/www/conservancy/apps/contacts/urls.py b/www/conservancy/apps/contacts/urls.py
index 3fb33645cdd396771ea0577863e9534c87776867..7ff3287bc17d37760075a21213e2b8fadb2c03f2 100644
--- a/www/conservancy/apps/contacts/urls.py
+++ b/www/conservancy/apps/contacts/urls.py
@@ -1,5 +1,5 @@
 from django.conf.urls.defaults import *
 
-urlpatterns = patterns('sflc.apps.contacts.views',
+urlpatterns = patterns('conservancy.apps.contacts.views',
    (r'^/?$', 'subscribe'),
 )
diff --git a/www/conservancy/apps/contacts/views.py b/www/conservancy/apps/contacts/views.py
index c8a104c4794e51d6b6fa2c7fbdb5053590f80f54..6bc12099438f830c3eddaa718a63145ec0880711 100644
--- a/www/conservancy/apps/contacts/views.py
+++ b/www/conservancy/apps/contacts/views.py
@@ -11,8 +11,7 @@ def subscribe(request):
         class Meta:
             model = ContactEntry
 
-    ContactEntryForm.base_fields['subscribe_sflc'].label = 'Receive Software Freedom Law Center updates'
-    ContactEntryForm.base_fields['subscribe_sfc'].label = 'Receive Software Freedom Conservancy updates'
+    ContactEntryForm.base_fields['subscribe_conservancy'].label = 'Receive Software Freedom Conservancy updates'
 
     if request.method == 'POST':
         form = ContactEntryForm(request.POST)
diff --git a/www/conservancy/apps/events/models.py b/www/conservancy/apps/events/models.py
index 4379dc65c756304cb7d53c258f65db9ec6cf91e8..26b478f086fe1e56e28f2690ccd784135a2a2edd 100644
--- a/www/conservancy/apps/events/models.py
+++ b/www/conservancy/apps/events/models.py
@@ -1,6 +1,6 @@
 from django.db import models
-from sflc.apps.staff.models import Person
-from sflc.apps.worldmap.models import EarthLocation
+from conservancy.apps.staff.models import Person
+from conservancy.apps.worldmap.models import EarthLocation
 from datetime import datetime, timedelta
 
 class EventTag(models.Model):
@@ -29,7 +29,7 @@ class FutureEventManager(models.Manager):
         return super(FutureEventManager, self).get_query_set().filter(date__gte=datetime.today())
 
 class Event(models.Model):
-    """Model for SFLC staff member events (presentations, etc)"""
+    """Model for Conservancy staff member events (presentations, etc)"""
 
     title = models.CharField(max_length=400)
     date = models.DateField()
diff --git a/www/conservancy/apps/events/urls.py b/www/conservancy/apps/events/urls.py
index 8541241f260abbc51079e39c5e369359c95f0314..931dc7a5c38ec6dd36e679006d20949911d7aa2d 100644
--- a/www/conservancy/apps/events/urls.py
+++ b/www/conservancy/apps/events/urls.py
@@ -12,7 +12,7 @@ urlpatterns = patterns('django.views.generic.date_based',
                                                  make_object_list=True)),
 )
 
-urlpatterns += patterns('sflc.apps.events.views',
+urlpatterns += patterns('conservancy.apps.events.views',
     (r'^/?$', 'custom_index', dict(info_dict, queryset=Event.past.all(), paginate_by=10)),
     (r'^(?P<year>\d{4})/(?P<slug>[-\w]+)/$', 'event_detail', dict(info_dict, slug_field='slug')),
     (r'^ics/$', 'future_event_ics', info_dict),
diff --git a/www/conservancy/apps/news/models.py b/www/conservancy/apps/news/models.py
index fa5efc16ea22f25674133cad65b1eac20c7f5778..d812d33c582bc3b92e2c9f3bd814beb2342314f7 100644
--- a/www/conservancy/apps/news/models.py
+++ b/www/conservancy/apps/news/models.py
@@ -1,7 +1,7 @@
 from django.db import models
 from django.conf import settings
-from sflc.apps.staff.models import Person
-from sflc.apps.events.models import Event
+from conservancy.apps.staff.models import Person
+from conservancy.apps.events.models import Event
 from django.contrib.sites.models import Site
 from datetime import datetime, timedelta
 
@@ -37,11 +37,11 @@ class PressRelease(models.Model):
 
     def is_in_past_month(self):
         # This function is deprecated.  Use the date_within template
-        # filter instead (example in sflc/templates/frontpage.html)
+        # filter instead (example in conservancy/templates/frontpage.html)
         return self.pub_date > (datetime.now() - timedelta(days=30))
 
     def save(self):
-        if settings.SFLC_DEVEL or True:
+        if settings.CONSERVANCY_DEVEL or True:
             super(PressRelease, self).save()
             return
 
@@ -78,7 +78,7 @@ class PublicExternalArticleManager(models.Manager):
         return super(PublicExternalArticleManager, self).get_query_set().filter(visible=True)
 
 class ExternalArticle(models.Model):
-    """A system for displaying SFLC news mentions on the site.
+    """A system for displaying Conservancy news mentions on the site.
 
     (Currently unused)
     """
diff --git a/www/conservancy/apps/news/views.py b/www/conservancy/apps/news/views.py
index a78fbb309191967860468309f853f1020ff49291..136811837a6d5200bd0f80cfa6587566cab0f676 100644
--- a/www/conservancy/apps/news/views.py
+++ b/www/conservancy/apps/news/views.py
@@ -1,6 +1,6 @@
 from django.views.generic.list_detail import object_list
-from sflc.apps.news.models import ExternalArticle
-from sflc.apps.events.models import Event
+from conservancy.apps.news.models import ExternalArticle
+from conservancy.apps.events.models import Event
 from datetime import datetime
 
 def custom_index(request, queryset, *args, **kwargs):
diff --git a/www/conservancy/apps/podcast/models.py b/www/conservancy/apps/podcast/models.py
index cbf94629e06582a0d43580e6331c7c31490ebfb5..893daa7a684828f6e070ab6d7e363eedd99f53d4 100644
--- a/www/conservancy/apps/podcast/models.py
+++ b/www/conservancy/apps/podcast/models.py
@@ -1,6 +1,6 @@
 from django.db import models
 from django.conf import settings
-from sflc.apps.staff.models import Person
+from conservancy.apps.staff.models import Person
 from datetime import datetime, timedelta
 
 class PodcastTag(models.Model):
diff --git a/www/conservancy/apps/podcast/urls.py b/www/conservancy/apps/podcast/urls.py
index bd57be65d025ae538b7a77a25b416522265873cf..7694d9e5beff54052828b88e6d282bd85e548bdc 100644
--- a/www/conservancy/apps/podcast/urls.py
+++ b/www/conservancy/apps/podcast/urls.py
@@ -1,6 +1,6 @@
 from django.conf.urls.defaults import *
 from models import Podcast, PodcastTag # relative import
-from sflc.apps.staff.models import Person
+from conservancy.apps.staff.models import Person
 from datetime import datetime
 
 extra_context = {}
@@ -21,7 +21,7 @@ urlpatterns = patterns('django.views.generic.date_based',
 #   (r'^(?P<slug>[-\w]+)/$', 'object_detail', dict(info_dict, slug_field='slug')),
 )
 
-urlpatterns += patterns('sflc.apps.podcast.views',
+urlpatterns += patterns('conservancy.apps.podcast.views',
    (r'^/?$', 'custom_index', dict(info_dict, paginate_by=20)),
    (r'^query/$', 'query'),
 )
diff --git a/www/conservancy/apps/podcast/views.py b/www/conservancy/apps/podcast/views.py
index 90e7de103e7274541d90612812a47261c32f7f68..bd45f483bdc800b6a24db38d2b7bf1140b8f638b 100644
--- a/www/conservancy/apps/podcast/views.py
+++ b/www/conservancy/apps/podcast/views.py
@@ -1,6 +1,6 @@
 from models import Podcast, PodcastTag # relative import
 from django.views.generic.list_detail import object_list
-from sflc.apps.staff.models import Person
+from conservancy.apps.staff.models import Person
 from django.shortcuts import get_object_or_404, render_to_response
 from datetime import datetime
 
diff --git a/www/conservancy/apps/summit_registration/urls.py b/www/conservancy/apps/summit_registration/urls.py
index c335a587d2cf006a643c1c438a153500d789f2b2..0a6d5c8b8976a97af896d3957ae48d3bd03ba6e0 100644
--- a/www/conservancy/apps/summit_registration/urls.py
+++ b/www/conservancy/apps/summit_registration/urls.py
@@ -1,5 +1,5 @@
 from django.conf.urls.defaults import *
 
-urlpatterns = patterns('sflc.apps.summit_registration.views',
+urlpatterns = patterns('conservancy.apps.summit_registration.views',
    (r'^/?$', 'register'),
 )