shane/rockviewer
1
0
Fork 0
Code Issues 1 Pull Requests Releases 2 Wiki Activity

Work on new ui layout

Browse Source
This commit is contained in:
Shane Frischkorn
2014-02-20 15:21:50 +10:00
parent ef96af8d46
commit 8c05629d51
66 changed files with 11627 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
three_d_viewer/urls.py
View File

@@ -1,10 +1,15 @@
from django.conf import settings
from django.conf.urls import patterns, url
from django.views import generic
from three_d_viewer import views
urlpatterns = patterns(
'',
url(r'^$', views.HomeView.as_view(), name='home'),
url(r'^$', generic.TemplateView.as_view(template_name="three_d_viewer/home.html"), name='home'),
url(r'^minerals_theory/$', generic.TemplateView.as_view(template_name="three_d_viewer/minerals_theory.html"), name='minerals_theory'),
url(r'^minerals_practice/$', generic.TemplateView.as_view(template_name="three_d_viewer/minerals_practice.html"), name='minerals_practice'),
url(r'^minerals_selftest/$', generic.TemplateView.as_view(template_name="three_d_viewer/minerals_selftest.html"), name='minerals_selftest'),
url(r'^(?P<pk>\d+)/$', views.DetailView.as_view(), name='detail'),
url(r'^minerals/(?P<pk>\d+)/$', views.MineralDetailView.as_view(), name='mineral_detail'),
url(r'^media/(?P<path>.*)$', 'django.views.static.serve',