fixed blueprint issue with index

NorthIsUp · Mar 6, 2012 · 6c713da · 6c713da
1 parent ded03b4
commit 6c713da
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 6 deletions.
diff --git a/...blueprints/dashboard/templates/_base.html → .../dashboard/templates/dashboard/_base.html b/...blueprints/dashboard/templates/_base.html → .../dashboard/templates/dashboard/_base.html
@@ -3,14 +3,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
     {% block head %}
-    {% include '_head.html' %}
+    {% include 'dashboard/_head.html' %}
     {% endblock %}
 </head>
 <body {% block bodyattr %}{% endblock %} >
     <div id="content">{% block content %}{% endblock %}</div>
     <div id="footer">
         {% block footer %}
-        {% include '_foot.html' %}
+        {% include 'dashboard/_foot.html' %}
         {% endblock %}
     </div>
 </body>
diff --git a/...blueprints/dashboard/templates/_foot.html → .../dashboard/templates/dashboard/_foot.html b/...blueprints/dashboard/templates/_foot.html → .../dashboard/templates/dashboard/_foot.html
diff --git a/...blueprints/dashboard/templates/_head.html → .../dashboard/templates/dashboard/_head.html b/...blueprints/dashboard/templates/_head.html → .../dashboard/templates/dashboard/_head.html
diff --git a/...rints/dashboard/templates/_meme_form.html → ...board/templates/dashboard/_meme_form.html b/...rints/dashboard/templates/_meme_form.html → ...board/templates/dashboard/_meme_form.html
diff --git a/.../blueprints/dashboard/templates/_nav.html → ...s/dashboard/templates/dashboard/_nav.html b/.../blueprints/dashboard/templates/_nav.html → ...s/dashboard/templates/dashboard/_nav.html
diff --git a/...prints/dashboard/templates/bootstrap.html → ...hboard/templates/dashboard/bootstrap.html b/...prints/dashboard/templates/bootstrap.html → ...hboard/templates/dashboard/bootstrap.html
diff --git a/...blueprints/dashboard/templates/index.html → .../dashboard/templates/dashboard/index.html b/...blueprints/dashboard/templates/index.html → .../dashboard/templates/dashboard/index.html
@@ -1,8 +1,8 @@
-{% extends '_base.html' %}
+{% extends 'dashboard/_base.html' %}
 {% block bodyattr %}id="deploy" class="dashboard" style="background-image:url('{{ url_for('.static', filename='static/images/dash.png') }}',background-repeat: no-repeat)"{% endblock %}
 
 {% block head %}
-    {% include '_head.html' %}
+    {% include 'dashboard/_head.html' %}
 
     <title>Deploy Dashboard</title>
     <link rel="stylesheet" type="text/css" href="{{ url_for('.static', filename='css/screen.css') }}">
@@ -13,7 +13,7 @@
 {% endblock %}
 {% block content %}
 
-{% include '_nav.html' %}
+{% include 'dashboard/_nav.html' %}
 
 
 <div class="container-fluid">

diff --git a/mrsdash/blueprints/dashboard/views.py b/mrsdash/blueprints/dashboard/views.py
@@ -48,7 +48,7 @@ def charts():
         'the_time': display_time(time)
         }
 
-    return render_template('index.html', **d)
+    return render_template('dashboard/index.html', **d)
 
 
 # __views_attrs = {