b06daba446
* master: added BSD license Update master use django-forms-bootstrap fixed account links on homepage fixed staticfiles settings removed homepage use of ifsetting_tag updated urls updated templates updated imports to reflect new layout updated imports to reflect new layout updated settings updated manage.py updated requirements to 1.4 / DUA and latest versions updated project layout for 1.4 (without content changes) Conflicts: requirements/base.txt symposion/settings.py symposion_project/urls.py
28 lines
No EOL
876 B
Python
28 lines
No EOL
876 B
Python
from django.conf import settings
|
|
from django.conf.urls.defaults import *
|
|
from django.conf.urls.static import static
|
|
|
|
from django.views.generic.simple import direct_to_template
|
|
|
|
from django.contrib import admin
|
|
admin.autodiscover()
|
|
|
|
# from pinax.apps.account.openid_consumer import PinaxConsumer
|
|
|
|
WIKI_SLUG = r"(([\w-]{2,})(/[\w-]{2,})*)"
|
|
|
|
urlpatterns = patterns("",
|
|
url(r"^$", direct_to_template, {
|
|
"template": "homepage.html",
|
|
}, name="home"),
|
|
url(r"^admin/", include(admin.site.urls)),
|
|
url(r"^about/", include("symposion.about.urls")),
|
|
url(r"^account/", include("account.urls")),
|
|
# url(r"^openid/", include(PinaxConsumer().urls)),
|
|
|
|
url(r"^(?P<slug>%s)/$" % WIKI_SLUG, "cms.views.page", name="cms_page"),
|
|
url(r"^markitup/", include("markitup.urls")),
|
|
)
|
|
|
|
|
|
urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) |