martin/blechreiz-website
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

User Profile & URL Cleanup

Browse Source
This commit is contained in:
Martin Bauer
2013-09-29 16:22:42 +02:00
parent d71c35bcd7
commit 0e26988867
9 changed files with 43 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
blechreiz/database.sqlite
View File

Binary file not shown.

25
blechreiz/urls.py
View File

@@ -2,29 +2,26 @@ from django.conf.urls import patterns, include, url
from django.contrib import admin
from musicians.views import MusicianList, addressbook
from musicians.views import user_edit
import website.views
import simpleforum.views
import eventplanner.urls
import musicians.urls
import settings
from django.conf.urls.static import static
admin.autodiscover()
urlpatterns = patterns('',
url(r'$^', website.views.home_view ),
url(r'^events/', include( eventplanner.urls.urlpatterns) ),
url(r'^admin/', include(admin.site.urls) ),
url(r'^admin/doc/', include('django.contrib.admindocs.urls') ),
url(r'^musicians/$', MusicianList.as_view() ),
url(r'^musicians/(?P<username>[\w]+)$', user_edit ),
url(r'^addressbook/$', addressbook ),
url(r'^login/$', website.views.login_view),
url(r'$^', website.views.home_view ),
url(r'^login/$', website.views.login_view),
url(r'^login/usernames$', website.views.userlistForAutocompletion),
url(r'^logout/$', website.views.logout_view),
url(r'^messages/$', simpleforum.views.message_view ),
url(r'^location_field/', include('location_field.urls')),
url(r'^logout/$', website.views.logout_view),
url(r'^events/', include( eventplanner.urls.urlpatterns) ),
url(r'^musicians/', include( musicians.urls.urlpatterns) ),
url(r'^messages/$', simpleforum.views.message_view ),
url(r'^admin/', include(admin.site.urls) ),
url(r'^location_field/', include('location_field.urls')),
) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)