NewsBlur/urls.py
Samuel Clay 3567922ae2 Merge branch 'jammit' into social
* jammit:
  Adding node's 8888 to app ufw. Also adding redis's 6379 to express server.
  Adding socket.io-client
  Adding node modules.
  Retooling fabfile's deploy code to support serial asset packaging with parallel code deploys.
  Upgrading nginx version.
  Fixing public_root in assets.yml to be readbale by old yml.
  Adding static/ to gitignore.
  Moving images and theme assets around.
  Relative to absolute urls for all embedded images.
  Fixing up jammit branch for launch by adding socket.io, bookmarklet, and compressed static assets. Still needs icons.
  Fixing css conflicts in jammit. Adding code rendering to jammit for bookmarklet.
  Adding /static to nginx conf.
  Adding jQuery 1.7 and new static directory.
  JS is now complete. Need to fix css embeds.
  Initial stub of Jammit assets.

Conflicts:
	media/css/reader.css
2012-01-03 09:30:28 -08:00

35 lines
1.6 KiB
Python

from django.conf.urls.defaults import include, url, patterns
from django.conf import settings
from apps.reader import views as reader_views
from apps.static import views as static_views
urlpatterns = patterns('',
url(r'^$', reader_views.index, name='index'),
(r'^reader/', include('apps.reader.urls')),
(r'^rss_feeds/', include('apps.rss_feeds.urls')),
(r'^classifier/', include('apps.analyzer.urls')),
(r'^profile/', include('apps.profile.urls')),
(r'^import/', include('apps.feed_import.urls')),
(r'^api/', include('apps.api.urls')),
(r'^recommendations/', include('apps.recommendations.urls')),
(r'^statistics/', include('apps.statistics.urls')),
(r'^social/', include('apps.social.urls')),
(r'^mobile/', include('apps.mobile.urls')),
(r'^m/', include('apps.mobile.urls')),
url(r'^about/?', static_views.about, name='about'),
url(r'^faq/?', static_views.faq, name='faq'),
url(r'^api/?', static_views.api, name='api'),
url(r'^press/?', static_views.press, name='press'),
url(r'^feedback/?', static_views.feedback, name='feedback'),
url(r'^iphone/?', static_views.iphone, name='iphone'),
)
if settings.DEVELOPMENT:
urlpatterns += patterns('',
(r'^media/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': settings.MEDIA_ROOT}),
)
urlpatterns += patterns('',
(r'^static/(?P<path>.*)$', 'django.views.static.serve',
{'document_root': settings.STATIC_ROOT}),
)