diff --git a/main/admin.py b/main/admin.py index 50c6f84..343d0a0 100644 --- a/main/admin.py +++ b/main/admin.py @@ -1,4 +1,4 @@ from django.contrib import admin -from snurrweb.main.models import * +from models import * admin.site.register(Entry) diff --git a/main/views.py b/main/views.py index 363947e..04dbf78 100644 --- a/main/views.py +++ b/main/views.py @@ -7,7 +7,7 @@ from django.shortcuts import render_to_response, get_object_or_404 from django.template import RequestContext from django.core.paginator import Paginator, EmptyPage, InvalidPage -from snurrweb.main.models import * +from models import * def home(request): entry_list = Entry.objects.all().order_by('created').reverse() diff --git a/settings-sample.py b/settings-sample.py index d32925a..cfb3e56 100644 --- a/settings-sample.py +++ b/settings-sample.py @@ -101,7 +101,7 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.messages.middleware.MessageMiddleware', ) -ROOT_URLCONF = 'snurrweb.urls' +ROOT_URLCONF = 'urls' TEMPLATE_DIRS = ( os.path.join(os.path.dirname(os.path.abspath(__file__)), 'templates/') diff --git a/urls.py b/urls.py index 6a8d2ee..844ea26 100644 --- a/urls.py +++ b/urls.py @@ -1,15 +1,15 @@ from django.conf.urls.defaults import patterns, include, url -from django.contrib.staticfiles.urls import staticfiles_urlpatterns # for dev +#from django.contrib.staticfiles.urls import staticfiles_urlpatterns # for dev from django.contrib import admin admin.autodiscover() urlpatterns = patterns('', # Examples: - url(r'^$', 'snurrweb.main.views.home', name='home'), - url(r'^log/$', 'snurrweb.main.views.log', name='log'), + url(r'^$', 'main.views.home', name='home'), + url(r'^log/$', 'main.views.log', name='log'), # url(r'^snurrweb/', include('snurrweb.foo.urls')), url(r'^admin/', include(admin.site.urls)), ) -urlpatterns += staticfiles_urlpatterns() +#urlpatterns += staticfiles_urlpatterns()