From d59d4907e6915c75f11aee2565765979b9377d48 Mon Sep 17 00:00:00 2001
From: Soeren Sonnenburg <sonne@debian.org>
Date: Thu, 14 Nov 2013 02:24:11 +0100
Subject: [PATCH] properly integrate into website and put live

---
 pages/views.py | 27 +++++++++++++++++++++++++++
 shogun/urls.py |  2 +-
 util/matrix.py |  7 ++++---
 3 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/pages/views.py b/pages/views.py
index 6683a25..38008c1 100644
--- a/pages/views.py
+++ b/pages/views.py
@@ -1,8 +1,11 @@
 # Create your views here.
 
+from django.template.response import TemplateResponse
+
 import shogun.settings as settings
 import util.notebook
 import util.demo
+import util.matrix
 
 from django.http import HttpResponse,Http404
 
@@ -235,6 +238,30 @@ def irclogs(request):
 												 'irclogfiles' : all_entries,
 		                                         'news' : news})))
 
+def matrix(request):
+	allpages = Page.objects.order_by('sort_order')
+	news = get_news()[0]
+	allsubpages=[]
+
+	try:
+		parent_subpages = Subpage.objects.filter(rootpage__path__exact='features', is_top=True).order_by('sort_order')
+	except:
+		parent_subpages = None
+
+	current_parent=None
+	details={'current_page_path' : 'features',
+			 'current_subpage_path' : 'matrix',
+			 'all_pages' : allpages,
+			 'all_subpages' : allsubpages,
+			 'parent_subpages' : parent_subpages,
+			 'current_parent' : current_parent,
+			 'news' : news,
+			 'table' : util.matrix.get_matrix(),
+			 'related' : util.matrix.get_related_projects()
+			 }
+
+	return TemplateResponse(request, 'matrix.html', details)
+
 def demo(request):
 	try:
 		template = get_template("notebooks.html")
diff --git a/shogun/urls.py b/shogun/urls.py
index e16ae75..ef64497 100644
--- a/shogun/urls.py
+++ b/shogun/urls.py
@@ -17,7 +17,7 @@
 
     # Other urls:
 
-    url(r'^page/features', 'util.matrix.display_matrix'),
+    url(r'^page/features', 'pages.views.matrix'),
 
     # Notebooks
     url(r'^notebooks/list', 'util.export.list_notebooks'),
diff --git a/util/matrix.py b/util/matrix.py
index edec312..7b811de 100644
--- a/util/matrix.py
+++ b/util/matrix.py
@@ -1,4 +1,3 @@
-from django.http import HttpResponse,Http404
 from django.template.response import TemplateResponse
 from shogun.settings import MATRIX_FILE
 
@@ -9,7 +8,8 @@ def fetch_spreadsheet():
 	csv = f.read()
 	file(MATRIX_FILE,'w').write(csv)
 
-def display_matrix(request):
+
+def get_matrix():
 	j=0
 	table=[]
 	for l in file(MATRIX_FILE).readlines():
@@ -52,7 +52,8 @@ def display_matrix(request):
 			else:
 				table.append("%s</td><td>" % i)
 		table.append("%s</td></tr><tr><td>" % s2[-1])
-	return TemplateResponse(request, 'matrix.html', {'table': ''.join(table), 'related' : get_related_projects() })
+
+	return ''.join(table)
 
 
 def get_related_projects():