diff --git a/www/conservancy/apps/blog/admin.py b/www/conservancy/apps/blog/admin.py index e1e68d85..18a4aa93 100644 --- a/www/conservancy/apps/blog/admin.py +++ b/www/conservancy/apps/blog/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from models import EntryTag, Entry +from conservancy.apps.blog.models import EntryTag, Entry class EntryTagAdmin(admin.ModelAdmin): prepopulated_fields = {'slug': ('label',)} diff --git a/www/conservancy/apps/blog/urls.py b/www/conservancy/apps/blog/urls.py index e5efc304..d4d11cb0 100644 --- a/www/conservancy/apps/blog/urls.py +++ b/www/conservancy/apps/blog/urls.py @@ -1,8 +1,8 @@ from django.conf.urls import patterns, url, include -from models import Entry, EntryTag # relative import +from conservancy.apps.blog.models import Entry, EntryTag # relative import from conservancy.apps.staff.models import Person from datetime import datetime -from views import last_name, BlogYearArchiveView, BlogMonthArchiveView, BlogDayArchiveView, BlogDateDetailView +from conservancy.apps.blog.views import last_name, BlogYearArchiveView, BlogMonthArchiveView, BlogDayArchiveView, BlogDateDetailView extra_context = {} diff --git a/www/conservancy/apps/blog/views.py b/www/conservancy/apps/blog/views.py index 7a7a818a..bfbee9fc 100644 --- a/www/conservancy/apps/blog/views.py +++ b/www/conservancy/apps/blog/views.py @@ -1,4 +1,4 @@ -from models import Entry, EntryTag # relative import +from conservancy.apps.blog.models import Entry, EntryTag # relative import # from django.views.generic.list_detail import object_list from django.views.generic import ListView from django.views.generic.dates import YearArchiveView, MonthArchiveView, DayArchiveView, DateDetailView diff --git a/www/conservancy/apps/contacts/admin.py b/www/conservancy/apps/contacts/admin.py index 2f8ad313..e52b6aa5 100644 --- a/www/conservancy/apps/contacts/admin.py +++ b/www/conservancy/apps/contacts/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from models import ContactEntry +from conservancy.apps.contacts.models import ContactEntry class ContactEntryAdmin(admin.ModelAdmin): list_display = ('email', 'subscribe_conservancy') diff --git a/www/conservancy/apps/contacts/views.py b/www/conservancy/apps/contacts/views.py index 6bc12099..25f28be9 100644 --- a/www/conservancy/apps/contacts/views.py +++ b/www/conservancy/apps/contacts/views.py @@ -1,6 +1,6 @@ from django.shortcuts import render_to_response from django import forms -from models import ContactEntry +from conservancy.app.contacts.models import ContactEntry from django.forms import ModelForm def subscribe(request): diff --git a/www/conservancy/apps/events/admin.py b/www/conservancy/apps/events/admin.py index 0860a16b..32c75d7d 100644 --- a/www/conservancy/apps/events/admin.py +++ b/www/conservancy/apps/events/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from models import EventTag, Event, EventMedia +from conservancy.apps.event.models import EventTag, Event, EventMedia admin.site.register(EventTag) diff --git a/www/conservancy/apps/events/urls.py b/www/conservancy/apps/events/urls.py index 650d8b0c..e6802e48 100644 --- a/www/conservancy/apps/events/urls.py +++ b/www/conservancy/apps/events/urls.py @@ -1,5 +1,5 @@ from django.conf.urls import patterns, url, include -from models import Event # relative import +from conservancy.apps.events.models import Event info_dict = { 'queryset': Event.objects.all(), diff --git a/www/conservancy/apps/events/views.py b/www/conservancy/apps/events/views.py index f78832c0..d9f9be44 100644 --- a/www/conservancy/apps/events/views.py +++ b/www/conservancy/apps/events/views.py @@ -3,7 +3,7 @@ from django.shortcuts import render_to_response from django.http import Http404, HttpResponse from django.template import loader from django.core.exceptions import ObjectDoesNotExist -from models import Event # relative import +from conservancy.apps.events.models import Event # for debugging... from django.http import HttpResponse diff --git a/www/conservancy/apps/fundgoal/admin.py b/www/conservancy/apps/fundgoal/admin.py index 2b2e1704..825dc205 100644 --- a/www/conservancy/apps/fundgoal/admin.py +++ b/www/conservancy/apps/fundgoal/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from models import FundraisingGoal +from conservancy.apps.fundgoal.models import FundraisingGoal class FundraisingGoalAdmin(admin.ModelAdmin): list_display = ('display_name', 'display_until_date') diff --git a/www/conservancy/apps/fundgoal/views.py b/www/conservancy/apps/fundgoal/views.py index d737af6a..17c40cf3 100644 --- a/www/conservancy/apps/fundgoal/views.py +++ b/www/conservancy/apps/fundgoal/views.py @@ -1,2 +1,2 @@ -from models import FundraisingGoal # relative import +from conservancy.apps.fundgoal.models import FundraisingGoal from django.shortcuts import get_object_or_404, render_to_response diff --git a/www/conservancy/apps/news/admin.py b/www/conservancy/apps/news/admin.py index da275ea2..7c554b4c 100644 --- a/www/conservancy/apps/news/admin.py +++ b/www/conservancy/apps/news/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from models import PressRelease, ExternalArticleTag, ExternalArticle +from conservancy.apps.news.models import PressRelease, ExternalArticleTag, ExternalArticle class PressReleaseAdmin(admin.ModelAdmin): list_display = ("headline", "pub_date") diff --git a/www/conservancy/apps/news/urls.py b/www/conservancy/apps/news/urls.py index cb48e89e..2b20bbe9 100644 --- a/www/conservancy/apps/news/urls.py +++ b/www/conservancy/apps/news/urls.py @@ -19,8 +19,8 @@ from django.conf.urls import patterns, url, include from django.conf import settings -from models import PressRelease, ExternalArticle # relative import -from views import NewsYearArchiveView, NewsMonthArchiveView, NewsDayArchiveView, NewsDateDetailView +from conservancy.app.news.models import PressRelease, ExternalArticle +from conservancy.apps.news.views import NewsYearArchiveView, NewsMonthArchiveView, NewsDayArchiveView, NewsDateDetailView info_dict = { 'queryset': PressRelease.objects.all().filter(sites__id__exact=settings.SITE_ID), diff --git a/www/conservancy/apps/staff/admin.py b/www/conservancy/apps/staff/admin.py index bdd06295..a661b7e9 100644 --- a/www/conservancy/apps/staff/admin.py +++ b/www/conservancy/apps/staff/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from models import Person +from conservancy.apps.staff.models import Person class PersonAdmin(admin.ModelAdmin): list_display = ("username", "formal_name", "casual_name", diff --git a/www/conservancy/apps/summit_registration/admin.py b/www/conservancy/apps/summit_registration/admin.py index 0e33adb6..84d4f8e7 100644 --- a/www/conservancy/apps/summit_registration/admin.py +++ b/www/conservancy/apps/summit_registration/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from models import SummitRegistration +from conservancy.apps.summit_registration.models import SummitRegistration class SummitRegistrationAdmin(admin.ModelAdmin): list_display = ('name', 'email', 'affiliation', 'cle_credit') diff --git a/www/conservancy/apps/summit_registration/views.py b/www/conservancy/apps/summit_registration/views.py index 1a1b9e7d..59629696 100644 --- a/www/conservancy/apps/summit_registration/views.py +++ b/www/conservancy/apps/summit_registration/views.py @@ -1,6 +1,6 @@ from django.shortcuts import render_to_response from django import forms -from models import SummitRegistration +from conervancy.apps.summit_registration.models import SummitRegistration def register(request): """Summit registration form view diff --git a/www/conservancy/apps/supporters/admin.py b/www/conservancy/apps/supporters/admin.py index 9654d68f..04ddb44b 100644 --- a/www/conservancy/apps/supporters/admin.py +++ b/www/conservancy/apps/supporters/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from models import Supporter +from conservancy.app.Supporter.models import Supporter class SupporterAdmin(admin.ModelAdmin): list_display = ('display_name', 'display_until_date') diff --git a/www/conservancy/apps/supporters/views.py b/www/conservancy/apps/supporters/views.py index b6c60aa4..c02e3483 100644 --- a/www/conservancy/apps/supporters/views.py +++ b/www/conservancy/apps/supporters/views.py @@ -1,3 +1,3 @@ -from models import Supporter # relative import +from conservancy.apps.supporters.models import Supporter from django.shortcuts import get_object_or_404, render_to_response diff --git a/www/conservancy/apps/worldmap/admin.py b/www/conservancy/apps/worldmap/admin.py index e505eae5..11e238d3 100644 --- a/www/conservancy/apps/worldmap/admin.py +++ b/www/conservancy/apps/worldmap/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from models import EarthLocation +from conservancy.apps.worldmap.models import EarthLocation class EarthLocationAdmin(admin.ModelAdmin): list_display = ("label", "html_map_link")