Merged much of the stanford htsworkflow frontend into trunk.

[htsworkflow.git] / htsworkflow / frontend / urls.py

diff --git a/htsworkflow/frontend/urls.py b/htsworkflow/frontend/urls.py
index 51bf8c41bab1cec970e7d735de87ae4a35610391..95552bd65f86d20d635d8102dac1a4ecf4d42077 100644 (file)
--- a/htsworkflow/frontend/urls.py
+++ b/htsworkflow/frontend/urls.py
@@ -1,23 +1,25 @@
 from django.conf.urls.defaults import *
+from django.contrib import admin
+admin.autodiscover()
 
 # Databrowser:
-from django.contrib import databrowse
-from htsworkflow.frontend.samples.models import Library
-databrowse.site.register(Library)
+#from django.contrib import databrowse
+#from htsworkflow.frontend.samples.models import Library
+#databrowse.site.register(Library)
 #databrowse.site.register(FlowCell)
 
 urlpatterns = patterns('',
     # Base:
     (r'^eland_config/', include('htsworkflow.frontend.eland_config.urls')),
     # Admin:
-     (r'^admin/', include('django.contrib.admin.urls')),
-    # ExpTrack:
-     (r'^experiments/', include('htsworkflow.frontend.experiments.urls')),
+    (r'^admin/(.*)', admin.site.root),
+    # Experiments:
+    (r'^experiments/', include('htsworkflow.frontend.experiments.urls')),
     # AnalysTrack:
-     (r'^analysis/', include('htsworkflow.frontend.analysis.urls')),
+    #(r'^analysis/', include('htsworkflow.frontend.analysis.urls')),
     # Report Views:
     # (r'^reports/', include('gaworkflow.frontend....urls')),
     
     # databrowser
-    (r'^databrowse/(.*)', databrowse.site.root)
+    #(r'^databrowse/(.*)', databrowse.site.root)
 )