Trying to commit all my work

1 files changed, 24 insertions, 30 deletions

diff --git a/src/lib/Server/Hostbase/urls.py b/src/lib/Server/Hostbase/urls.py
index 4e45e883c..01fe97d4f 100644
--- a/src/lib/Server/Hostbase/urls.py
+++ b/src/lib/Server/Hostbase/urls.py
@@ -1,33 +1,27 @@
 from django.conf.urls.defaults import *
+from django.conf import settings
+from django.views.generic.simple import direct_to_template
+from django.contrib import admin
 
-urlpatterns = patterns('Bcfg2.Server.Hostbase.hostbase.views',
-                       
-                       (r'^admin/', include('django.contrib.admin.urls')),
-                       (r'^hostbase/$', 'search'),
-                       (r'^$','index' ),
-                       (r'^hostbase/(?P<host_id>\d+)/$', 'look'),
-                       (r'^hostbase/(?P<host_id>\d+)/edit', 'edit'),
-                       (r'^hostbase/(?P<host_id>\d+)/remove', 'remove'),
-                       (r'^hostbase/(?P<host_id>\d+)/(?P<item>\D+)/(?P<item_id>\d+)/confirm', 'confirm'),
-                       (r'^hostbase/(?P<host_id>\d+)/(?P<item>\D+)/(?P<item_id>\d+)/(?P<name_id>\d+)/confirm', 'confirm'),
-                       (r'^hostbase/(?P<host_id>\d+)/dns/edit', 'dnsedit'),
-                       (r'^hostbase/(?P<host_id>\d+)/dns', 'dns'),
-                       (r'^hostbase/(?P<host_id>\d+)/logs/(?P<log_id>\d+)', 'printlog'),
-                       (r'^hostbase/(?P<host_id>\d+)/logs', 'logs'),
-                       (r'^hostbase/new', 'new'),
-                       (r'^hostbase/(?P<host_id>\d+)/copy', 'copy'),
-                       (r'^hostbase/hostinfo', 'hostinfo'),
-                       (r'^hostbase/zones/$', 'zones'),
-                       (r'^hostbase/zones/(?P<zone_id>\d+)/$', 'zoneview'),                       
-                       (r'^hostbase/zones/(?P<zone_id>\d+)/edit', 'zoneedit'),
-                       (r'^hostbase/zones/new/$', 'zonenew'),
-                       (r'^hostbase/zones/(?P<zone_id>\d+)/(?P<item>\D+)/(?P<item_id>\d+)/confirm', 'confirm'),
-                       )
 
-urlpatterns += patterns('',                        
-                        (r'^login/$', 'django.contrib.auth.views.login',
-                         {'template_name': 'login.html'}),
-                        (r'^logout/$', 'django.contrib.auth.views.logout',
-                         {'template_name': 'logout.html'})
-                        )
-                       
+admin.autodiscover()
+
+
+urlpatterns = patterns('',
+    # Uncomment the admin/doc line below and add 'django.contrib.admindocs'
+    # to INSTALLED_APPS to enable admin documentation:
+    (r'^admin/doc/', include('django.contrib.admindocs.urls')),
+
+    # Uncomment the next line to enable the admin:
+    (r'^admin/', include(admin.site.urls)),
+
+    (r'^$',direct_to_template, {'template':'index.html'}, 'index'),
+    (r'^hostbase/', include('hostbase.urls')),
+    (r'^login/$', 'django.contrib.auth.views.login', {'template_name': 'login.html'}),
+    (r'^logout/$', 'django.contrib.auth.views.logout', {'template_name': 'logout.html'})
+)
+
+if settings.SERVE_MEDIA:
+    urlpatterns += patterns('',
+        (r'^site_media/(?P<path>.*)$', 'django.views.static.serve',
+         dict(document_root=settings.MEDIA_ROOT)),)