Resolve issue with api_invman

Splake Root · Splake Root · commit 3ba3c822108a · 2016-06-11T14:36:26.000-04:00
diff --git a/api_invman/urls.py b/api_invman/urls.py
@@ -10,9 +10,9 @@
 urlpatterns = [
     # urls for Django Rest Framework API
     url(r'^api/v1/', include(router.urls)),
-    url(r'^api_invman/api/$', views.apiListView.as_view(), name='api_invman_api_list'),
-    url(r'^api_invman/api/create/$', views.apiCreateView.as_view(), name='api_invman_api_create'),
-    url(r'^api_invman/api/detail/(?P<id>\S+)/$', views.apiDetailView.as_view(), name='api_invman_api_detail'),
-    url(r'^api_invman/api/update/(?P<id>\S+)/$', views.apiUpdateView.as_view(), name='api_invman_api_update'),
+    url(r'^api/$', views.apiListView.as_view(), name='api_invman_api_list'),
+    url(r'^api/create/$', views.apiCreateView.as_view(), name='api_invman_api_create'),
+    url(r'^api/detail/(?P<id>\S+)/$', views.apiDetailView.as_view(), name='api_invman_api_detail'),
+    url(r'^api/update/(?P<id>\S+)/$', views.apiUpdateView.as_view(), name='api_invman_api_update'),
 ]
 
diff --git a/invman/settings.py b/invman/settings.py
@@ -38,6 +38,8 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'rest_framework',
+    'crispy_forms',
+    'api_invman',
 ]
 
 MIDDLEWARE_CLASSES = [
@@ -56,7 +58,7 @@
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
+        'DIRS': ['templates'],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
diff --git a/invman/urls.py b/invman/urls.py
@@ -13,9 +13,10 @@
     1. Import the include() function: from django.conf.urls import url, include
     2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
 """
-from django.conf.urls import url
+from django.conf.urls import url, include
 from django.contrib import admin
 
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
+    url(r'^', include('api_invman.urls'), name='api_invman'),
 ]
diff --git a/templates/api_invman/api_detail.html b/templates/api_invman/api_detail.html
@@ -13,4 +13,4 @@
 </table>
 <a class="btn btn-primary" href="{{object.get_update_url}}">Edit api</a>
 
-{% endblock %}
+{% endblock %}
diff --git a/templates/api_invman/api_form.html b/templates/api_invman/api_form.html
@@ -8,4 +8,4 @@
 {{form|crispy}}
 <button class="btn btn-primary" type="submit">Submit</button>
 </form>
-{% endblock %}
+{% endblock %}
diff --git a/templates/api_invman/api_list.html b/templates/api_invman/api_list.html
@@ -27,4 +27,4 @@
 </tr>
 {% endfor %}
 </table><a class="btn btn-primary" href="{% url 'api_invman_api_create' %}">Create new api</a>
-{% endblock %}
+{% endblock %}
diff --git a/templates/api_invman/base.html b/templates/api_invman/base.html
@@ -0,0 +1 @@
+<html><head></head><body>{% block content %}Replace this.{% endblock %}</body>
diff --git a/templates/base.html b/templates/base.html
@@ -1 +1,10 @@
-<html><head></head><body>{% block content %}Replace this.{% endblock %}</body>
+<html>
+<head>
+<title>{% block title %}{% endblock %}</title>
+<link href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.6/paper/bootstrap.min.css" rel="stylesheet" integrity="sha384-2mX2PSpkRSXLQzmNzH3gwK6srb06+OfbDlYjbog8LQuALYJjuQ3+Yzy2JIWNV9rW" crossorigin="anonymous">
+<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>
+</head>
+<body>
+{% block content %}{% endblock %}
+</body>
+</html>
diff --git a/uwsgi.py b/uwsgi.py

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+<html><head></head><body>{% block content %}Replace this.{% endblock %}</body>`