Move templates into app

vkurup · May 6, 2012 · ea392b9 · ea392b9
1 parent 243c9ef
commit ea392b9
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 7 deletions.
diff --git a/templates/portfolio/base.html → portfolio/templates/base.html b/templates/portfolio/base.html → portfolio/templates/base.html
diff --git a/portfolio/templates/portfolio.html b/portfolio/templates/portfolio.html
@@ -0,0 +1,12 @@
+{% extends "base.html" %}
+
+{% block title %}Portfolio{% endblock %}
+
+{% block content %}
+
+<h2>Portfolio</h2>
+<hr>
+
+<p><a href="txn">View all transactions</a></p>
+
+{% endblock %}
diff --git a/templates/portfolio/transaction_detail.html → portfolio/templates/transaction_detail.html b/templates/portfolio/transaction_detail.html → portfolio/templates/transaction_detail.html
@@ -1,4 +1,4 @@
-{% extends "portfolio/base.html" %}
+{% extends "base.html" %}
 
 {% block title %}One Transaction{% endblock %}
 

diff --git a/templates/portfolio/transaction_list.html → portfolio/templates/transaction_list.html b/templates/portfolio/transaction_list.html → portfolio/templates/transaction_list.html
@@ -1,4 +1,4 @@
-{% extends "portfolio/base.html" %}
+{% extends "base.html" %}
 
 {% block title %}Transactions{% endblock %}
 

diff --git a/portfolio/urls.py b/portfolio/urls.py
@@ -1,11 +1,15 @@
 from django.conf.urls import patterns, url, include
-from django.views.generic import ListView, DetailView
+from django.views.generic import ListView, DetailView, TemplateView
 from portfolio.models import Transaction
 
 urlpatterns = patterns(
     '',
-    (r'^$', ListView.as_view(
+    (r'^$', TemplateView.as_view(
-            model=Transaction)),
+            template_name="portfolio.html")),
-    (r'^(?P<pk>\d+)/$', DetailView.as_view(
+    (r'^txn/$', ListView.as_view(
-            model=Transaction)),
+            model=Transaction,
+            template_name="transaction_list.html")),
+    (r'^txn/(?P<pk>\d+)/$', DetailView.as_view(
+            model=Transaction,
+            template_name="transaction_detail.html")),
 )