Commit 600c1418 authored by christophe siraut's avatar christophe siraut

namechange fixes

parent a94624b8
No preview for this file type
......@@ -77,7 +77,7 @@ MIDDLEWARE_CLASSES = (
'django.contrib.auth.middleware.AuthenticationMiddleware',
)
ROOT_URLCONF = 'nuage.urls'
ROOT_URLCONF = 'nuages.urls'
TEMPLATE_DIRS = (
# Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
......@@ -91,7 +91,7 @@ INSTALLED_APPS = (
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.sites',
'nuage.sondage',
'nuages.sondage',
)
LOGIN_URL = '/user/login/'
......
......@@ -8,8 +8,8 @@ from django.core.urlresolvers import reverse
from django.template import RequestContext
from django.forms.formsets import formset_factory
from django.forms.models import inlineformset_factory, BaseInlineFormSet
from nuage.sondage.models import Poll, Choice, Vote, Bulletin
from nuage.sondage.forms import PollForm, ChoiceForm, VoteForm, BulletinForm
from nuages.sondage.models import Poll, Choice, Vote, Bulletin
from nuages.sondage.forms import PollForm, ChoiceForm, VoteForm, BulletinForm
from django.views.generic.create_update import update_object
from django.contrib.auth.decorators import login_required
#from django.contrib.sites.models import Site
......
from django.conf.urls.defaults import *
from django.contrib.auth.views import login, logout
from nuage.sondage.models import Poll
from nuage.sondage.forms import PollForm
from nuages.sondage.models import Poll
from nuages.sondage.forms import PollForm
# Uncomment the next two lines to enable the admin:
# from django.contrib import admin
......@@ -31,16 +31,16 @@ urlpatterns = patterns('',
(r'^$', 'django.views.generic.list_detail.object_list', dict(info_dict, template_name='index.html')),
(r'^nuages$', 'django.views.generic.simple.direct_to_template', {'template': 'nuages.html'}),
(r'^(?P<poll_id>\w{4})/$', 'nuage.sondage.views.vote'),
(r'^new/$', 'nuage.sondage.views.new'),
(r'^(?P<object_id>\w+)/edit/$', 'nuage.sondage.views.secure_update_object', dict(poll_dict, post_save_redirect='choices/')),
(r'^(?P<poll_id>\w{4})/$', 'nuages.sondage.views.vote'),
(r'^new/$', 'nuages.sondage.views.new'),
(r'^(?P<object_id>\w+)/edit/$', 'nuages.sondage.views.secure_update_object', dict(poll_dict, post_save_redirect='choices/')),
#(r'^(?P<poll_id>\w+)/edit/$', 'nuage.sondage.views.edit'),
(r'^(?P<poll_id>\w+)/edit/choices/$', 'nuage.sondage.views.editchoices'),
(r'^(?P<poll_id>\w{4})/vote/$', 'nuage.sondage.views.vote'),
(r'^(?P<poll_id>\w+)/edit/choices/$', 'nuages.sondage.views.editchoices'),
(r'^(?P<poll_id>\w{4})/vote/$', 'nuages.sondage.views.vote'),
(r'^user/login/$', login),
(r'^user/logout/$', logout, {'template_name': 'index.html'}),
(r'^user/register', 'nuage.sondage.userviews.register'),
(r'^user/register', 'nuages.sondage.userviews.register'),
(r'^user/success$', 'django.views.generic.simple.direct_to_template', {'template': 'registration/success.html'}),
(r'^i18n/', include('django.conf.urls.i18n')),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment