diff --git a/apps/people/admin.py b/apps/people/admin.py index ea11416..03931c1 100644 --- a/apps/people/admin.py +++ b/apps/people/admin.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from myconf.apps.people.models import Person +from people.models import Person from django.contrib import admin class PersonAdmin(admin.ModelAdmin): diff --git a/apps/people/management/commands/exportspeakers.py b/apps/people/management/commands/exportspeakers.py index 21a9ee5..23e02ee 100644 --- a/apps/people/management/commands/exportspeakers.py +++ b/apps/people/management/commands/exportspeakers.py @@ -1,4 +1,4 @@ -from apps.people.models import Person +from people.models import Person try: import json except ImportError: diff --git a/apps/people/views.py b/apps/people/views.py index 2a95ef9..d338153 100644 --- a/apps/people/views.py +++ b/apps/people/views.py @@ -16,7 +16,7 @@ from django.http import HttpResponse from django.template import RequestContext, loader -from myconf.apps.people.models import Person +from people.models import Person from django.shortcuts import render_to_response, get_object_or_404 def staff(request): diff --git a/apps/restaurants/admin.py b/apps/restaurants/admin.py index e10802d..7eb9e47 100644 --- a/apps/restaurants/admin.py +++ b/apps/restaurants/admin.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from myconf.apps.restaurants.models import * +from restaurants.models import * from django.contrib import admin def opening_times_list(r): diff --git a/apps/restaurants/views.py b/apps/restaurants/views.py index bcd77da..dd094dd 100644 --- a/apps/restaurants/views.py +++ b/apps/restaurants/views.py @@ -16,7 +16,7 @@ from django.http import HttpResponse from django.template import RequestContext, loader -from myconf.apps.restaurants.models import Restaurant +from restaurants.models import Restaurant def list(request): rests = Restaurant.objects.all().order_by("distance") diff --git a/apps/schedule/admin.py b/apps/schedule/admin.py index 904811f..8c380c7 100644 --- a/apps/schedule/admin.py +++ b/apps/schedule/admin.py @@ -14,9 +14,9 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from myconf.apps.schedule.models import * +from schedule.models import * from django.contrib import admin -from myconf.apps.people.models import Person +from people.models import Person class TimeSlotAdmin(admin.ModelAdmin): list_display = ('day', 'begin_time', 'end_time', 'duration') diff --git a/apps/schedule/models.py b/apps/schedule/models.py index f994dd2..0e1b94e 100644 --- a/apps/schedule/models.py +++ b/apps/schedule/models.py @@ -19,8 +19,8 @@ from django.template.defaultfilters import date from django.conf import settings from django.contrib.auth.models import User -from myconf.apps.people.models import Person -from myconf.apps.colors.fields import ColorField +from people.models import Person +from colors.fields import ColorField from taggit.managers import TaggableManager now = datetime.now diff --git a/apps/schedule/views.py b/apps/schedule/views.py index d5e3757..dcc4e34 100644 --- a/apps/schedule/views.py +++ b/apps/schedule/views.py @@ -21,7 +21,7 @@ from django.http import HttpResponse from django.shortcuts import render_to_response, get_object_or_404 from django.template import loader, RequestContext -from myconf.apps.schedule.models import * +from schedule.models import * from taggit.models import Tag #@login_required(login_url='/admin/') diff --git a/apps/signup/admin.py b/apps/signup/admin.py index b7e77b2..ec9e065 100644 --- a/apps/signup/admin.py +++ b/apps/signup/admin.py @@ -15,7 +15,7 @@ # along with this program. If not, see . from django.contrib import admin -from myconf.apps.signup.models import * +from signup.models import * class SessionSignupAdmin(admin.ModelAdmin): diff --git a/apps/signup/views.py b/apps/signup/views.py index 77a367f..bc47ea3 100644 --- a/apps/signup/views.py +++ b/apps/signup/views.py @@ -1,6 +1,6 @@ from django.forms import ModelForm -from myconf.apps.signup.models import SessionSignup -from myconf.apps.schedule.models import Session +from signup.models import SessionSignup +from schedule.models import Session from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render_to_response, get_object_or_404 from django.template import loader, RequestContext