← Back to branch summary

~chipaca/unity-lens-video/custom-user-agent

« back to all changes in this revision

Viewing changes to urls.py

  • Committer: Janos Gyerik
  • Date: 2012-04-03 20:38:05 UTC
  • Revision ID: janos@axiom-20120403203805-d2e6j78xee1dhttx
renamed "main" module to "oneliners"

Show diffs side-by-side

added added

removed removed

Lines of Context:
urls.py
1
 
from django.conf.urls.defaults import *
 
1
from django.conf.urls.defaults import patterns, include
2
2
 
3
 
# Uncomment the next two lines to enable the admin:
4
3
from django.contrib import admin
5
4
admin.autodiscover()
6
5
 
7
6
urlpatterns = patterns('',
8
 
    # Example:
9
 
    (r'^$', include('bashoneliners.main.urls')),
10
 
    (r'^main/', include('bashoneliners.main.urls')),
11
 
    (r'^accounts/', include('bashoneliners.accounts.urls')),
12
 
 
13
 
    # Uncomment the admin/doc line below to enable admin documentation:
14
 
    (r'^admin/doc/', include('django.contrib.admindocs.urls')),
15
 
 
16
 
    # Uncomment the next line to enable the admin:
17
 
    (r'^admin/', include(admin.site.urls)),
18
 
)
 
7
        (r'^$', include('oneliners.urls')),
 
8
        (r'^main/', include('oneliners.urls')),
 
9
 
 
10
        (r'^admin/doc/', include('django.contrib.admindocs.urls')),
 
11
        (r'^admin/', include(admin.site.urls)),
 
12
        (r'^comments/', include('django.contrib.comments.urls')),
 
13
        )
 
14
 
 
15
try:
 
16
    import openid
 
17
    type(openid)
 
18
    urlpatterns += patterns('',
 
19
            (r'^openid/', include('django_openid_auth.urls')),
 
20
            )
 
21
except:
 
22
    pass
 
23
 
 
24
from oneliners.feeds import OneLinerEntries
 
25
 
 
26
urlpatterns += patterns('',
 
27
        (r'feed/$', OneLinerEntries()),
 
28
        )
 
29
 
19
30
 
20
31
from django.conf import settings
21
32
 
22
 
if settings.DEBUG:
 
33
if settings.USE_DJANGO_STATIC_SERVE_FOR_MEDIA:
23
34
    urlpatterns += patterns('',
24
 
            (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': 'media'}),
 
35
            (r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': 'media'}),
25
36
    )
26
37
 
 
38
# eof