git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manifold: fix in plugin.js
[myslice.git]
/
myslice
/
urls.py
diff --git
a/myslice/urls.py
b/myslice/urls.py
index
5fa99b4
..
b37ee50
100644
(file)
--- a/
myslice/urls.py
+++ b/
myslice/urls.py
@@
-41,11
+41,15
@@
urlpatterns = patterns(
#
# various trash views
#
#
# various trash views
#
- (r'^slice/?$', 'trash.sampleviews.slice_view'),
- (r'^slice/(?P<name>[\w\.]+)/?$', 'trash.sampleviews.slice_view'),
(r'^tab/?$', 'trash.sampleviews.tab_view'),
(r'^scroll/?$', 'trash.sampleviews.scroll_view'),
(r'^plugin/?$', 'trash.pluginview.test_plugin_view'),
(r'^dashboard/?$', 'trash.dashboard.dashboard_view'),
(r'^tab/?$', 'trash.sampleviews.tab_view'),
(r'^scroll/?$', 'trash.sampleviews.scroll_view'),
(r'^plugin/?$', 'trash.pluginview.test_plugin_view'),
(r'^dashboard/?$', 'trash.dashboard.dashboard_view'),
- (r'^hazelnut/?$', 'trash.haze.hazelnut_view'),
+ (r'^slice/?$', 'trash.sliceview.slice_view'),
+ (r'^slice/(?P<slicename>[\w\.]+)/?$', 'trash.sliceview.slice_view'),
+ # Portal
+ url(r'^portal/', include('portal.urls')),
+ # Debug
+ url(r'^debug/', include('debug_platform.urls')),
+
)
)