Revision 8b5381f3 okeanos_site/urls.py
b/okeanos_site/urls.py | ||
---|---|---|
1 | 1 |
import os |
2 |
from synnefo.urls import * |
|
3 | 2 |
|
4 |
urlpatterns += patterns('', |
|
3 |
from django.conf.urls.defaults import * |
|
4 |
from django.conf import settings |
|
5 |
|
|
6 |
from synnefo.urls import urlpatterns as synnefo_urls |
|
7 |
|
|
8 |
urlpatterns = patterns('', |
|
9 |
|
|
10 |
# change app url from root (/) to (/ui) |
|
11 |
url(r'^ui$', 'synnefo.ui.views.home', name='index'), |
|
12 |
|
|
13 |
# intro page is now the root |
|
14 |
url(r'^$', 'synnefo.okeanos_site.views.intro', name='okeanos_intro'), |
|
15 |
# intro view also as /intro to avoid appending root (/) to the AAI_SKIP_LIST |
|
5 | 16 |
url(r'^intro$', 'synnefo.okeanos_site.views.intro', name='okeanos_intro'), |
6 |
url(r'^okeanos$', 'synnefo.okeanos_site.views.index', name='okeanos_index'), |
|
7 |
url(r'^okeanos_static/(.*)$', 'django.views.static.serve', |
|
8 |
{'document_root': os.path.join(os.path.dirname(__file__), 'static')}), |
|
17 |
|
|
18 |
# video/info page |
|
19 |
url(r'^about$', 'synnefo.okeanos_site.views.index', name='okeanos_index'), |
|
20 |
|
|
9 | 21 |
) |
10 | 22 |
|
23 |
|
|
24 |
urlpatterns += synnefo_urls |
|
25 |
|
|
26 |
if settings.DEBUG: |
|
27 |
urlpatterns += patterns('', |
|
28 |
url(r'^okeanos_static/(.*)$', 'django.views.static.serve', |
|
29 |
{'document_root': os.path.join(os.path.dirname(__file__), 'static/okeanos_static')}), |
|
30 |
) |
Also available in: Unified diff