Swicthing machines

2 files changed, 19 insertions, 9 deletions

diff --git a/motor/settings.py b/motor/settings.py
index d085f13..612efee 100644
--- a/motor/settings.py
+++ b/motor/settings.py
@@ -130,7 +130,8 @@ INSTALLED_APPS = (
     #'django.contrib.admin',
     # Uncomment the next line to enable admin documentation:
     # 'django.contrib.admindocs',
-    'apps.core', 'apps.docs', 'apps.checkin', 'apps.troubleshooting'
+    'bootstrap3',
+    'apps.core', 'apps.docs', 'apps.checkin', 'apps.issues'
 )
 
 # A sample logging configuration. The only tangible logging
diff --git a/motor/urls.py b/motor/urls.py
index 13ebf37..39822d7 100644
--- a/motor/urls.py
+++ b/motor/urls.py
@@ -1,18 +1,27 @@
 from django.conf.urls import patterns, include, url
 from django.views.generic import TemplateView
-from apps.core.views import LoginView, SitesListView
-
-# Uncomment the next two lines to enable the admin:
-#from django.contrib import admin
-#admin.autodiscover()
-
+from apps.core.views import *
+from apps.issues.views import *
 
 urlpatterns = patterns(
     '',
     #url(r'^$', 'docs.views.index', name='docs-index'),
     url(r'^manage/$', LoginView.as_view(), name='core-login'),
-    url(r'^manage/sites/$', SitesListView.as_view(), name='core-list_sites'),
-    url(r'^terms/$', TemplateView.as_view(template_name="terms.html"), {'title': 'ServoApp Terms of Service'}),
+    url(r'^manage/logout/$', logout, name='core-logout'),
+    url(r'^manage/docs/$', ArticleListView.as_view(), name='core-list_docs'),
+    url(r'^manage/docs/add/$', ArticleCreateView.as_view(), name='core-add_article'),
+    url(r'^manage/docs/(?P<pk>\d+)/$', ArticleEditView.as_view(), name='core-edit_article'),
+    url(r'^manage/users/$', UserListView.as_view(), name='core-list_users'),
+    url(r'^manage/users/(?P<pk>\d+)/$', UserEditView.as_view(), name='core-edit_user'),
+    url(r'^manage/users/add/$', UserCreateView.as_view(), name='core-add_user'),
+    url(r'^manage/providers/$', ProvidersListView.as_view(), name='core-list_sites'),
+    url(r'^manage/providers/(?P<pk>\d+)/$', ProviderEditView.as_view(), name='core-edit_provider'),
+    url(r'^manage/providers/add/$', CreateSiteView.as_view(), name='core-add_site'),
+    url(r'^manage/issues/$', IssueListView.as_view(), name='issues-list_issues'),
+    url(r'^manage/issues/add/$', IssueCreateView.as_view(), name='issues-add_issue'),
+    url(r'^manage/issues/(?P<pk>\d+)/$', IssueEditView.as_view(), name='issues-edit_issue'),
+    url(r'^terms/$', TemplateView.as_view(template_name="terms.html"),
+        {'title': 'ServoApp Terms of Service'}),
     #(r'^admin/', include(admin.site.urls)),
     url(r'^([\w\-]+)/$', 'docs.views.view_article', name='docs-view'),
 )