Merge branch 'master' of github.com:timothyb89/stackviz

Conflicts:
	stackviz/urls.py

stackviz/templates/menu.html

@@ -39,6 +39,18 @@
             </ul>
             <!-- /.nav-second-level -->
         </li>
+        <li>
+            <a href="#"><i class="fa fa-bar-chart-o fa-fw"></i> Upstream<span class="fa arrow"></span></a>
+            <ul class="nav nav-second-level">
+                <li>
+                    <a href="/upstream/test"><i class="fa fa-bar-chart-o fa-fw"></i> Test Stats</a>
+                </li>
+                <li>
+                    <a href="/upstream/run"><i class="fa fa-clock-o fa-fw"></i> Run Metadata</a>
+                </li>
+            </ul>
+            <!-- /.nav-second-level -->
+        </li>
     </ul>
 </div>
 <!-- /.sidebar-collapse -->

stackviz/templates/tempest/results.html

@@ -1,7 +1,14 @@
 {% extends 'template.html' %}
 
+{% load staticfiles %}
+
 {% block title %}Tempest Results{% endblock %}
 
+{% block head-extra %}
+    <!-- Scripts for visualization-->
+    <script src="{% static 'js/visuals.js' %}"></script>
+{% endblock %}
+
 {% block body %}
 
 <div class="row">

stackviz/templates/tempest/summary.html

@@ -1,7 +1,14 @@
 {% extends 'template.html' %}
 
+{% load staticfiles %}
+
 {% block title %}Tempest Summary{% endblock %}
 
+{% block head-extra %}
+<!-- Script for summary page-->
+    <script src="{% static 'js/summary.js' %}"></script>
+{% endblock %}
+
 {% block body %}
 
 <div class="row">
@@ -11,7 +18,7 @@
 </div>
 
 <div class="row">
-    <div class="col-lg-8">
+    <div class="col-lg-6">
         <div class="panel panel-default">
             <div class="panel-heading">Overview</div>
             <div class="panel-body" id="run-summary-div">

stackviz/templates/template.html

@@ -59,12 +59,6 @@
     <!-- DataTable for jQuery -->
     <script src="{% static 'components/datatables/media/js/jquery.dataTables.min.js' %}"></script>
 
-    <!-- Scripts for visualization-->
-    <script src="{% static 'js/visuals.js' %}"></script>
-
-    <!-- Script for summary page-->
-    <script src="{% static 'js/summary.js' %}"></script>
-
     {% block head-extra %}{% endblock %}
 </head>
 

stackviz/templates/upstream/run.html

@@ -0,0 +1,14 @@
+{% extends 'template.html' %}
+
+{% block title %}Upstream Run Metadata{% endblock %}
+
+{% block body %}
+
+<div class="row">
+    <div class="col-lg-12">
+        <h1 class="page-header">Upstream Run Metadata</h1>
+    </div>
+    <!-- /.col-lg-12 -->
+</div>
+
+{% endblock %}

stackviz/templates/upstream/test.html

@@ -0,0 +1,14 @@
+{% extends 'template.html' %}
+
+{% block title %}Upstream Test Stats{% endblock %}
+
+{% block body %}
+
+<div class="row">
+    <div class="col-lg-12">
+        <h1 class="page-header">Upstream Test Stats</h1>
+    </div>
+    <!-- /.col-lg-12 -->
+</div>
+
+{% endblock %}

stackviz/urls.py

@@ -12,4 +12,5 @@ urlpatterns = patterns('',
     url(r'^index.html$', IndexView.as_view(), name="index"),
     url(r'^tempest_', include('stackviz.views.tempest.urls')),
     url(r'^devstack_', include('stackviz.views.devstack.urls')),
+    url(r'^upstream_', include ('stackviz.views.upstream.urls'))
 )

stackviz/views/upstream/run.py

@@ -0,0 +1,4 @@
+from django.views.generic import TemplateView
+
+class RunView(TemplateView):
+    template_name = 'upstream/run.html'

stackviz/views/upstream/test.py

@@ -0,0 +1,4 @@
+from django.views.generic import TemplateView
+
+class TestView(TemplateView):
+    template_name = 'upstream/test.html'

stackviz/views/upstream/urls.py

@@ -0,0 +1,16 @@
+from django.conf.urls import patterns, include, url
+
+from .run import RunView
+from .test import TestView
+
+
+urlpatterns = patterns('',
+
+    url(r'^run/$',
+        RunView.as_view(),
+        name='aggregate_results'),
+
+    url(r'^test/$',
+        TestView.as_view(),
+        name='summary_results')
+)